Skip to content

Commit af4dede

Browse files
committed
Upgraded CherryPy framework usage, gradle and compiler usage. Fixed credentials issue.
1 parent 998a0e1 commit af4dede

File tree

17 files changed

+19
-37
lines changed

17 files changed

+19
-37
lines changed

.DS_Store

2 KB
Binary file not shown.

AndroLabServer/README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Install the below libraries using: easy_install <libraryname>
1313
* flask-sqlalchemy
1414
* simplejson
1515
* cherrypy
16-
16+
* web.py
1717

1818
Running the python server
1919
-----

AndroLabServer/app.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import getopt
2+
import web
3+
from web.wsgiserver import CherryPyWSGIServer
24
import sys
35
from flask import Flask, request, request_started
4-
from cherrypy import wsgiserver
6+
#from cherrypy import wsgiserver
57
from functools import wraps
68
from models import User, Account
79
from database import db_session
@@ -143,12 +145,13 @@ def devlogin():
143145
elif op == "--port":
144146
port = int(arg1)
145147

146-
dispatch = wsgiserver.WSGIPathInfoDispatcher({'/': app})
147-
server = wsgiserver.CherryPyWSGIServer(('0.0.0.0', port), dispatch, timeout=200)
148-
148+
urls = ("/.*", "app")
149+
apps = web.application(urls, globals())
150+
server = CherryPyWSGIServer(("0.0.0.0", port),app,server_name='localhost')
149151
print "The server is hosted on port:",(port)
150152

151153
try:
152154
server.start()
155+
#apps.run(port)
153156
except KeyboardInterrupt:
154157
server.stop()

AndroLabServer/app.pyc

4.95 KB
Binary file not shown.

AndroLabServer/database.pyc

0 Bytes
Binary file not shown.

AndroLabServer/models.pyc

0 Bytes
Binary file not shown.

AndroLabServer/mydb.db

0 Bytes
Binary file not shown.

InsecureBankv2/.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

InsecureBankv2/.idea/encodings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

InsecureBankv2/.idea/gradle.xml

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)