Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-30 09:05:48 +01:00
Code Issues 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

18
setup/server.py
View file

@ -32,7 +32,6 @@ def process_default(self, event):
print
print name, 'changed'
self.command.kill_server()
time.sleep(0.1)
self.command.launch_server()
print self.command.prompt,
sys.stdout.flush()
@ -53,7 +52,7 @@ def launch_server(self):
print 'Starting server...\n'
with self.lock:
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)
time.sleep(0.2)
if p.poll() is not None:
@ -63,11 +62,12 @@ def launch_server(self):
def kill_server(self):
print 'Killing server...\n'
with self.lock:
if self.server_proc.poll() is None:
self.server_proc.terminate()
while self.server_proc.poll() is None:
time.sleep(0.1)
if self.server_proc is not None:
with self.lock:
if self.server_proc.poll() is None:
self.server_proc.terminate()
while self.server_proc.poll() is None:
time.sleep(0.1)
def watch(self):
if wm is not None:
@ -83,14 +83,14 @@ def run(self, opts):
self.prompt = 'Press Enter to kill/restart server. Ctrl+C to quit: '
print 'Server log available at:', logf
print
self.server_proc = None
self.watch()
while True:
self.server_proc = self.launch_server()
self.launch_server()
try:
raw_input(self.prompt)
except:
print
self.kill_server()
break
else: