monkey island can now be run from both monkey_island.py and run_cc.bat

monkey/monkey_island.py

@@ -0,0 +1,4 @@
+import monkey_island.cc.main
+
+if "__main__" == __name__:
+    monkey_island.cc.main.main()

monkey/monkey_island/cc/main.py

@@ -14,7 +14,8 @@ from cc.utils import local_ip_addresses
 from cc.environment.environment import env
 from cc.database import is_db_server_up
 
-if __name__ == '__main__':
+
+def main():
     from tornado.wsgi import WSGIContainer
     from tornado.httpserver import HTTPServer
     from tornado.ioloop import IOLoop
@@ -36,3 +37,6 @@ if __name__ == '__main__':
         print('Monkey Island Server is running on https://{}:{}'.format(local_ip_addresses()[0], env.get_island_port()))
         IOLoop.instance().start()
 
+
+if __name__ == '__main__':
+    main()

monkey/monkey_island/windows/run_cc.bat

@@ -1,4 +1,4 @@
 @title C^&C Server
 @pushd ..
-@monkey_island\bin\Python27\python monkey_island\cc\main.py
+@monkey_island\bin\Python27\python monkey_island.py
 @popd