diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-03-23 19:49:15 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-03-23 19:49:15 +0100 |
| commit | 9b607c80f62387799284058f78c15fc7c159ed3f (patch) | |
| tree | e6c3f403d785cdad5ec2cad5554c3b71072793e4 /module/web | |
| parent | merge (diff) | |
| download | pyload-9b607c80f62387799284058f78c15fc7c159ed3f.tar.xz | |
handling SIGQUIT
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/ServerThread.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/web/ServerThread.py b/module/web/ServerThread.py index b05b3d0dc..0fbb65dfa 100644 --- a/module/web/ServerThread.py +++ b/module/web/ServerThread.py @@ -110,7 +110,7 @@ class WebServer(threading.Thread): self.p = Popen(command, stderr=PIPE, stdin=PIPE, stdout=Output(stdout)) command2 = ['nginx', '-c', join(path, "servers", "nginx.conf"),] - self.p2 = Popen(command2, stderr=PIPE, stdin=PIPE, stdout=PIPE) + self.p2 = Popen(command2, stderr=PIPE, stdin=PIPE, stdout=Output(stdout)) elif self.server == "lighttpd": @@ -142,14 +142,14 @@ class WebServer(threading.Thread): self.p = Popen(command, stderr=PIPE, stdin=PIPE, stdout=Output(stdout)) command2 = ['lighttpd', '-D', '-f', join(path, "servers", "lighttpd.conf")] - self.p2 = Popen(command2, stderr=PIPE, stdin=PIPE, stdout=PIPE) + self.p2 = Popen(command2, stderr=PIPE, stdin=PIPE, stdout=Output(stdout)) elif self.server == "builtin": self.pycore.logger.info("Starting django builtin Webserver: %s:%s" % (host, port)) command = ['python', join(self.pycore.path, "module", "web", "run_server.py"), "%s:%s" % (host, port)] - self.p = Popen(command, stderr=PIPE, stdin=PIPE, stdout=PIPE) + self.p = Popen(command, stderr=Output(stdout), stdin=PIPE, stdout=Output(stdout)) else: #run fastcgi on port command = ['python', join(self.pycore.path, "module", "web", "manage.py"), "runfcgi", "daemonize=false", "method=threaded", "host=127.0.0.1", "port=%s" % port] |