Merge branch 'maintenance-pid_cleanup' of https://github.com/kevans91/OctoPrint into fix/1324

This commit is contained in:
Gina Häußge 2016-05-19 18:32:46 +02:00
commit b018a56e4c

View file

@ -24,7 +24,7 @@ class Main(Daemon):
self._logConf = logConf
def run(self):
octoprint = Server(self._configfile, self._basedir, self._host, self._port, self._debug, self._allowRoot)
octoprint = Server(self._configfile, self._basedir, self._host, self._port, self._debug, self._allowRoot, self._logConf, self)
octoprint.run()
def main():