Skip to content

Commit

Permalink
Version 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
filak committed Sep 25, 2020
1 parent 361caa5 commit dfa5a2d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion flask-app/application/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __call__(self, environ, start_response):

app.config.update(dict(
APP_NAME = 'MTW',
APP_VER = '1.4.0',
APP_VER = '1.4.1',
API_VER = '1.0.0',
DBVERSION = 1.0,
TEMP_DIR = mtu.get_instance_dir(app, 'temp'),
Expand Down
8 changes: 5 additions & 3 deletions flask-app/mtw-server.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
DEFAULT_HOST = '127.0.0.1'
DEFAULT_PORT = 55930
DEFAULT_THREADS = 64
DEFAULT_CONFIG = 'conf/mtw-dist.ini'
Expand All @@ -16,6 +17,7 @@
def main():
parser = argparse.ArgumentParser(description=appdesc, prog=appname, usage='%(prog)s [options]')
parser.add_argument('--config', type=str, help='Config file path - default: '+DEFAULT_CONFIG, default=DEFAULT_CONFIG)
parser.add_argument('--host', type=str, help='Host - default: '+DEFAULT_HOST, default=DEFAULT_HOST)
parser.add_argument('--port', type=int, help='Port number - default: '+str(DEFAULT_PORT), default=DEFAULT_PORT)
parser.add_argument('--threads', type=int, help='Number of threads - default: '+str(DEFAULT_THREADS), default=DEFAULT_THREADS)
parser.add_argument('--debug', help='Run in debug mode - DO NOT use in production !', action='store_true')
Expand All @@ -36,12 +38,12 @@ def main():
app.template_folder = os.path.join(os.path.dirname(sys.executable), 'templates')

try:
#serve(app, host='127.0.0.1', port=args.port, threads=args.threads)
serve(app, listen='127.0.0.1:'+str(args.port), threads=args.threads)
serve(app, host=args.host, port=args.port, threads=args.threads)
#serve(app, listen=args.host+':'+str(args.port), threads=args.threads)

except:
print('Server cannot be started - check/modify the args')

if __name__ == "__main__":
main()


9 changes: 6 additions & 3 deletions flask-app/mtw-worker.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
DEFAULT_HOST = '127.0.0.1'
DEFAULT_PORT = 55933
DEFAULT_THREADS = 64
DEFAULT_CONFIG = 'conf/mtw-dist.ini'
Expand All @@ -16,8 +17,10 @@
def main():
parser = argparse.ArgumentParser(description=appdesc, prog=appname, usage='%(prog)s [options]')
parser.add_argument('--config', type=str, help='Config file path - default: '+DEFAULT_CONFIG, default=DEFAULT_CONFIG)
parser.add_argument('--host', type=str, help='Host - default: '+DEFAULT_HOST, default=DEFAULT_HOST)
parser.add_argument('--port', type=int, help='Port number - default: '+str(DEFAULT_PORT), default=DEFAULT_PORT)
parser.add_argument('--threads', type=int, help='Number of threads - default: '+str(DEFAULT_THREADS), default=DEFAULT_THREADS)
parser.add_argument('--debug', help='Run in debug mode - DO NOT use in production !', action='store_true')

args, unknown = parser.parse_known_args()

Expand All @@ -28,15 +31,15 @@ def main():

logger = logging.getLogger('waitress')

app = create_app(debug=False, logger=logger, config_path=args.config)
app = create_app(debug=args.debug, logger=logger, config_path=args.config)

if getattr(sys, 'frozen', False):
app.static_folder = os.path.join(os.path.dirname(sys.executable), 'static')
app.template_folder = os.path.join(os.path.dirname(sys.executable), 'templates')

try:
#serve(app, host='127.0.0.1', port=args.port, threads=args.threads)
serve(app, listen='127.0.0.1:'+str(args.port), threads=args.threads)
serve(app, host=args.host, port=args.port, threads=args.threads)
#serve(app, listen=args.host+':'+str(args.port), threads=args.threads)

except:
print('Server cannot be started - check/modify the args')
Expand Down

0 comments on commit dfa5a2d

Please sign in to comment.