Mercurial > prosody-hg
comparison core/storagemanager.lua @ 4797:e239668aa6d2
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2012 02:10:55 +0100 |
| parents | b8b050e76ee1 |
| children | be33164aa97e |
comparison
equal
deleted
inserted
replaced
| 4796:04a34287dc12 | 4797:e239668aa6d2 |
|---|---|
| 45 end | 45 end |
| 46 prosody.events.add_handler("host-activated", initialize_host, 101); | 46 prosody.events.add_handler("host-activated", initialize_host, 101); |
| 47 | 47 |
| 48 function load_driver(host, driver_name) | 48 function load_driver(host, driver_name) |
| 49 if driver_name == "null" then | 49 if driver_name == "null" then |
| 50 return null_storage_provider; | 50 return null_storage_driver; |
| 51 end | 51 end |
| 52 local driver = stores_available:get(host, driver_name); | 52 local driver = stores_available:get(host, driver_name); |
| 53 if driver then return driver; end | 53 if driver then return driver; end |
| 54 local ok, err = modulemanager.load(host, "storage_"..driver_name); | 54 local ok, err = modulemanager.load(host, "storage_"..driver_name); |
| 55 if not ok then | 55 if not ok then |
