gracefully handle if a server is already running on the selected port, thanks Marc
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 1.99.7 (2012-05-10 22:29:01) dev
|
Version 1.99.7 (2012-05-10 22:30:42) dev
|
||||||
|
|||||||
@@ -403,6 +403,11 @@ class web2pyDialog(object):
|
|||||||
self.button_start.configure(state='normal')
|
self.button_start.configure(state='normal')
|
||||||
return self.error(str(e))
|
return self.error(str(e))
|
||||||
|
|
||||||
|
if not self.server_ready():
|
||||||
|
self.button_start.configure(state='normal')
|
||||||
|
tkMessageBox.showerror('web2py start server', 'server didn\'t start - check console')
|
||||||
|
return
|
||||||
|
|
||||||
self.button_stop.configure(state='normal')
|
self.button_stop.configure(state='normal')
|
||||||
|
|
||||||
if not options.taskbar:
|
if not options.taskbar:
|
||||||
@@ -415,6 +420,13 @@ class web2pyDialog(object):
|
|||||||
if self.tb:
|
if self.tb:
|
||||||
self.tb.SetServerRunning()
|
self.tb.SetServerRunning()
|
||||||
|
|
||||||
|
def server_ready(self):
|
||||||
|
for listener in self.server.server.listeners:
|
||||||
|
if listener.ready:
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
def stop(self):
|
def stop(self):
|
||||||
""" Stop web2py server """
|
""" Stop web2py server """
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user