diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-09-26 14:36:44 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-09-26 14:36:44 +0200 |
| commit | 263c8bfab4e444bc97b1ff92ffa097642e710493 (patch) | |
| tree | d945c72a7a57cc7139f1c30f23c889611ead060b /module/web | |
| parent | The pyLoad Team thanks everyone who was involved in development process with ... (diff) | |
| download | pyload-263c8bfab4e444bc97b1ff92ffa097642e710493.tar.xz | |
processing some plugins in collector
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/settings.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/module/web/settings.py b/module/web/settings.py index 756554deb..515117860 100644 --- a/module/web/settings.py +++ b/module/web/settings.py @@ -24,9 +24,7 @@ sys.path.append(os.path.join(PYLOAD_DIR, "module")) import InitHomeDir
sys.path.append(pypath)
-
-from module.ConfigParser import ConfigParser
-config = ConfigParser()
+config = None
#os.chdir(PROJECT_DIR) # UNCOMMENT FOR LOCALE GENERATION
#DEBUG = config.get("general","debug")
@@ -36,10 +34,14 @@ try: if not module.web.ServerThread.core:
raise Exception
PYLOAD = module.web.ServerThread.core.server_methods
+ config = module.web.ServerThread.core.config
except:
import xmlrpclib
ssl = ""
+ from module.ConfigParser import ConfigParser
+ config = ConfigParser()
+
if config.get("ssl", "activated"):
ssl = "s"
|