Merge branch 'master' of ssh://212.235.189.51:22122/codeq-server

2 files changed, 4 insertions, 1 deletions

diff --git a/daemon.py b/daemon.py
index 8a7c971..1198c32 100644
--- a/daemon.py
+++ b/daemon.py
@@ -3,7 +3,10 @@
 
 if __name__ == '__main__':
     import os
+    import signal
     import logging
     logging.basicConfig(filename=os.environ.get('CODEQ_SERVER_LOG') or 'codeq-server.log', level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s')
     import server
+
+    signal.signal(signal.SIGCHLD, signal.SIG_IGN)
     server.socket.serve_forever()
diff --git a/server/handlers.py b/server/handlers.py
index a7e0fef..a1bfbd7 100644
--- a/server/handlers.py
+++ b/server/handlers.py
@@ -100,7 +100,7 @@ class Settings(CodeqService):
             request.reply({'code': 1, 'message': 'New settings not provided'})
         else:
             try:
-                request.user_session.update_settings(settings)
+                request.session.update_settings(settings)
                 request.session.write_settings_to_db()
             except NoSuchSession:
                 request.reply({'code': 2, 'message': 'No such session'})