Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-10-30 23:42:35 -06:00
parent b597410d84
commit 32b21d78ef
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/server.py
View File

@ -32,7 +32,6 @@ else:
print print
print name, 'changed' print name, 'changed'
self.command.kill_server() self.command.kill_server()
time.sleep(0.1)
self.command.launch_server() self.command.launch_server()
print self.command.prompt, print self.command.prompt,
sys.stdout.flush() sys.stdout.flush()
@ -53,7 +52,7 @@ class Server(Command):
print 'Starting server...\n' print 'Starting server...\n'
with self.lock: with self.lock:
self.rebuild_monocole() self.rebuild_monocole()
p = subprocess.Popen(['calibre-server', '--develop'], self.server_proc = p = subprocess.Popen(['calibre-server', '--develop'],
stderr=subprocess.STDOUT, stdout=self.server_log) stderr=subprocess.STDOUT, stdout=self.server_log)
time.sleep(0.2) time.sleep(0.2)
if p.poll() is not None: if p.poll() is not None:
@ -63,6 +62,7 @@ class Server(Command):
def kill_server(self): def kill_server(self):
print 'Killing server...\n' print 'Killing server...\n'
if self.server_proc is not None:
with self.lock: with self.lock:
if self.server_proc.poll() is None: if self.server_proc.poll() is None:
self.server_proc.terminate() self.server_proc.terminate()
@ -83,14 +83,14 @@ class Server(Command):
self.prompt = 'Press Enter to kill/restart server. Ctrl+C to quit: ' self.prompt = 'Press Enter to kill/restart server. Ctrl+C to quit: '
print 'Server log available at:', logf print 'Server log available at:', logf
print print
self.server_proc = None
self.watch() self.watch()
while True: while True:
self.server_proc = self.launch_server() self.launch_server()
try: try:
raw_input(self.prompt) raw_input(self.prompt)
except: except:
print
self.kill_server() self.kill_server()
break break
else: else: