|
@ -33,23 +33,6 @@ from commands import known_commands, Commands |
|
|
from simple_config import SimpleConfig |
|
|
from simple_config import SimpleConfig |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def lockfile(config): |
|
|
|
|
|
return os.path.join(config.path, 'daemon') |
|
|
|
|
|
|
|
|
|
|
|
def get_daemon(config): |
|
|
|
|
|
try: |
|
|
|
|
|
with open(lockfile(config)) as f: |
|
|
|
|
|
host, port = ast.literal_eval(f.read()) |
|
|
|
|
|
except: |
|
|
|
|
|
return |
|
|
|
|
|
server = jsonrpclib.Server('http://%s:%d' % (host, port)) |
|
|
|
|
|
# check if daemon is running |
|
|
|
|
|
try: |
|
|
|
|
|
server.ping() |
|
|
|
|
|
return server |
|
|
|
|
|
except: |
|
|
|
|
|
pass |
|
|
|
|
|
|
|
|
|
|
|
class RequestHandler(SimpleJSONRPCRequestHandler): |
|
|
class RequestHandler(SimpleJSONRPCRequestHandler): |
|
|
|
|
|
|
|
|
def do_OPTIONS(self): |
|
|
def do_OPTIONS(self): |
|
@ -63,7 +46,6 @@ class RequestHandler(SimpleJSONRPCRequestHandler): |
|
|
SimpleJSONRPCRequestHandler.end_headers(self) |
|
|
SimpleJSONRPCRequestHandler.end_headers(self) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class Daemon(DaemonThread): |
|
|
class Daemon(DaemonThread): |
|
|
|
|
|
|
|
|
def __init__(self, config, server): |
|
|
def __init__(self, config, server): |
|
|