Skip to content

Commit

Permalink
Bug Fix setup.py and stop async backend if no backends
Browse files Browse the repository at this point in the history
  • Loading branch information
philberty committed Jun 6, 2014
1 parent 494456c commit 67244b6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
3 changes: 3 additions & 0 deletions WatchyServer/BackendUtil.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ def __init__ (self, backends):

def run (self):
ServerUtil.info ('Starting Async Backend handler')
if len (self.backends) == 0:
ServerUtil.info ('No Specified backends stopping handler')
return
self.running = True
while self.running:
try:
Expand Down
2 changes: 1 addition & 1 deletion etc/watchy/example-watchy.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ web_bind = 0.0.0.0
web_port = 8787
stats_bind = 0.0.0.0
stats_port = 7878
backends = mongo amqp
#backends = mongo amqp

[amqp]
type = rabbitmq
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@
#FIXME: requires = reqs,
keywords = ('stats', 'web', 'monitoring', 'udp'),
ext_modules = cythonize (extensions),
packages = ['WatchyServer'],
packages = ['WatchyServer', 'WatchyServer.backends'],
scripts = ['watchy.py'],
package_dir = {'WatchyServer': 'WatchyServer'},
package_data = {'WatchyServer': ['templates/*',
'static/css/*',
'static/js/*']},
Expand Down
2 changes: 0 additions & 2 deletions watchy.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ def serverMain ():
parser = optparse.OptionParser ()
parser.add_option ("-v", "--version", dest='version',
help="Print version", action="store_true")
parser.add_option ("-l", "--logfile", dest='logfile',
help="Ouput logfile", default="./server.log")
parser.add_option ("-c", "--config", dest="config",
help="Config file location", default=None)
parser.add_option ("-F", "--fork", dest="fork", action="store_true",
Expand Down

0 comments on commit 67244b6

Please sign in to comment.