From fab8c948215ed46cf78bd7a58b803efddb13dd0e Mon Sep 17 00:00:00 2001 From: Mason Larobina Date: Thu, 17 Dec 2009 19:58:36 +0800 Subject: Create sockets before daemonising in uzbl-{cookie-daemon,event-manager}. --- examples/data/uzbl/scripts/uzbl-cookie-daemon | 8 +++++--- examples/data/uzbl/scripts/uzbl-event-manager | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/data/uzbl/scripts/uzbl-cookie-daemon b/examples/data/uzbl/scripts/uzbl-cookie-daemon index 87a2e87..fde8b8e 100755 --- a/examples/data/uzbl/scripts/uzbl-cookie-daemon +++ b/examples/data/uzbl/scripts/uzbl-cookie-daemon @@ -304,6 +304,9 @@ class CookieMonster: if daemon_running(config['cookie_socket']): sys.exit(1) + # Create cookie daemon socket. + self.create_socket() + # Daemonize process. if config['daemon_mode']: echo("entering daemon mode") @@ -322,9 +325,6 @@ class CookieMonster: self._running = True while self._running: - # Create cookie daemon socket. - self.create_socket() - try: # Enter main listen loop. self.listen() @@ -345,6 +345,8 @@ class CookieMonster: # Always delete the socket before calling create again. self.del_socket() + # Create cookie daemon socket. + self.create_socket() def load_whitelist(self): diff --git a/examples/data/uzbl/scripts/uzbl-event-manager b/examples/data/uzbl/scripts/uzbl-event-manager index 7a02da9..916259a 100755 --- a/examples/data/uzbl/scripts/uzbl-event-manager +++ b/examples/data/uzbl/scripts/uzbl-event-manager @@ -583,16 +583,16 @@ class UzblEventDaemon(dict): def run(self): '''Main event daemon loop.''' + # Create event daemon socket. + self._create_server_socket() + echo('listening on: %s' % self.socket_location) + if CONFIG['daemon_mode']: echo('entering daemon mode.') daemonize() # The pid has changed so update the pid file. make_pid_file(CONFIG['pid_file']) - # Create event daemon socket. - self._create_server_socket() - echo('listening on: %s' % self.socket_location) - # Now listen for incoming connections and or data. self.listen() -- cgit v1.2.3