Fix for running cleanup on Firefox exit. Closes #38

pywalfox/__main__.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import atexit
 import logging
 import argparse
 import subprocess
@@ -58,9 +59,8 @@ def print_version():
 
 def run_daemon():
     """Starts the daemon."""
-    python_version = get_python_version()
-
-    daemon = Daemon(python_version.major)
+    daemon = Daemon(get_python_version().major)
+    atexit.register(daemon.close)
     daemon.start()
 
 def handle_args(args):

pywalfox/channel/unix/client.py

@@ -23,6 +23,6 @@ def connect(self, host):
             except OSError as e:
                 logging.error('Failed to connect to socket: %s' % e.strerror)
         else:
-            logging.error('Could not find socket: %s' % host)
+            logging.debug('Could not find socket: %s' % host)
 
         return False

pywalfox/channel/win/client.py

@@ -19,6 +19,6 @@ def connect(self, host):
             logging.debug('Successfully connected to UDP socket at: %s:%s' % (host[0], host[1]))
             return True
         except Exception as e:
-            logging.error('Failed to connect to socket: %s' % str(e))
+            logging.debug('Failed to connect to socket: %s' % str(e))
 
         return False

pywalfox/daemon.py

@@ -1,5 +1,4 @@
 import sys
-import signal
 import logging
 from threading import Thread
 
@@ -29,9 +28,6 @@ def __init__(self, python_version):
         self.socket_server = Server()
         self.is_running = False
 
-        signal.signal(signal.SIGINT, self.close)
-        signal.signal(signal.SIGTERM, self.close)
-
     def set_chrome_path(self):
         """Tries to set the path to the chrome directory."""
         self.chrome_path = get_firefox_chrome_path()
@@ -208,7 +204,7 @@ def start(self):
             logging.debug('Received message from extension: %s' % message)
             self.handle_message(message)
 
-    def close(self, signal, frame):
+    def close(self):
         """Application cleanup."""
         logging.debug('Running cleanup')
         self.is_running = False