save the client pidfile by default to ~/.djrandom.pid; fix typo in daemonize.py

client/djrandom_client/client.py

@@ -48,6 +48,8 @@ def main():
     daemonize.add_standard_options(parser)
     utils.read_config_defaults(
         parser, os.path.join(os.getenv('HOME'), '.djrandom.conf'))
+    parser.set_default(
+        'pidfile', os.path.join(os.getenv('HOME'), '.djrandom.pid'))
     opts, args = parser.parse_args()
     if not opts.api_key:
         parser.error('You must specify an API Key')

client/djrandom_client/daemonize.py

@@ -109,6 +109,7 @@ def daemonize(opts, main_function, args, support_gevent=False):
         os.chown(opts.pidfile, user_pw.pw_uid, user_pw.pw_gid)
 
     if support_gevent:
+        import gevent
         def _sighandler(signum):
             log.info('terminated by signal %d' % signum)
             pidfile.release()
@@ -120,8 +121,8 @@ def daemonize(opts, main_function, args, support_gevent=False):
             log.info('terminated by signal %d' % signum)
             pidfile.release()
             sys.exit(0)
-        signal(signal.SIGTERM, _sighandler)
-        signal(signal.SIGINT, _sighandler)            
+        signal.signal(signal.SIGTERM, _sighandler)
+        signal.signal(signal.SIGINT, _sighandler)            
 
     if not opts.foreground:
         null_fd = open(os.devnull, 'r+')

server/djrandom/daemonize.py

@@ -121,8 +121,8 @@ def daemonize(opts, main_function, args, support_gevent=False):
             log.info('terminated by signal %d' % signum)
             pidfile.release()
             sys.exit(0)
-        signal(signal.SIGTERM, _sighandler)
-        signal(signal.SIGINT, _sighandler)            
+        signal.signal(signal.SIGTERM, _sighandler)
+        signal.signal(signal.SIGINT, _sighandler)            
 
     if not opts.foreground:
         null_fd = open(os.devnull, 'r+')