diff options
author | Mason Larobina <mason.larobina@gmail.com> | 2009-12-17 20:59:01 +0800 |
---|---|---|
committer | Mason Larobina <mason.larobina@gmail.com> | 2009-12-17 20:59:01 +0800 |
commit | 523ace9dd6defe4a4dff2c1ea491beb67825c669 (patch) | |
tree | fe429a08f33ce96208e027dba87009f214447cd8 /examples | |
parent | b6234dbb7f643be31c2657df523bf0c2aaa5998c (diff) | |
parent | ffbf2c2aa3a8b8c3965a2f8f9d001815c8c46cc7 (diff) |
Merge branch 'master' into mode-binds
Diffstat (limited to 'examples')
-rwxr-xr-x | examples/data/uzbl/scripts/uzbl-cookie-daemon | 8 | ||||
-rwxr-xr-x | examples/data/uzbl/scripts/uzbl-event-manager | 8 |
2 files changed, 9 insertions, 7 deletions
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() |