Mercurial > prosody-hg
comparison core/modulemanager.lua @ 1908:27c1c6e6c583
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 05 Oct 2009 14:42:56 +0100 |
| parents | 5da0e3b1f847 0aa55a5dafde |
| children | 3884a0aac4d7 |
comparison
equal
deleted
inserted
replaced
| 1903:b7552b1e267d | 1908:27c1c6e6c583 |
|---|---|
| 99 return nil, "insufficient-parameters"; | 99 return nil, "insufficient-parameters"; |
| 100 end | 100 end |
| 101 | 101 |
| 102 if not modulemap[host] then | 102 if not modulemap[host] then |
| 103 modulemap[host] = {}; | 103 modulemap[host] = {}; |
| 104 hosts[host].modules = modulemap[host]; | |
| 104 end | 105 end |
| 105 | 106 |
| 106 if modulemap[host][module_name] then | 107 if modulemap[host][module_name] then |
| 107 log("warn", "%s is already loaded for %s, so not loading again", module_name, host); | 108 log("warn", "%s is already loaded for %s, so not loading again", module_name, host); |
| 108 return nil, "module-already-loaded"; | 109 return nil, "module-already-loaded"; |
