Browse Source

Add retrocompatibility behaviour to server.py

boyska 10 years ago
parent
commit
26b5548540
2 changed files with 10 additions and 1 deletions
  1. 3 1
      server/cli.py
  2. 7 0
      server/server.py

+ 3 - 1
server/cli.py

@@ -41,7 +41,7 @@ class DateTimeAction(Action):
             raise ValueError("'%s' is not a valid datetime" % values)
         setattr(namespace, self.dest, parsed_val)
 
-if __name__ == "__main__":
+def common_pre():
     prechecks = [pre_check_user, pre_check_permissions]
     configs = ['default_config.py']
     if 'TECHREC_CONFIG' in os.environ:
@@ -62,6 +62,8 @@ if __name__ == "__main__":
         for warn in check():
             logging.warn(warn)
 
+if __name__ == "__main__":
+    common_pre()
     parser = ArgumentParser(description='creates mp3 files from live recordings')
     sub = parser.add_subparsers(title='subcommands',
                                 description='valid subcommands',

+ 7 - 0
server/server.py

@@ -263,8 +263,15 @@ class RecServer:
 
 
 def main_cmd(*args):
+    """meant to be called from argparse"""
     c = RecServer()
     c._app.mount('/date', DateApp())
     c._app.mount('/api', RecAPI())
     c._app.run(host=get_config()['HOST'], port=get_config()['PORT'],
                debug=get_config()['DEBUG'])
+
+if __name__ == '__main__':
+    from cli import common_pre
+    common_pre()
+    logger.warn("Usage of server.py is deprecated; use cli.py")
+    main_cmd()