Fix multiple proxy launching issue

Author: Alexandru Meterez

fred/data/collect.py

@@ -4,8 +4,7 @@
 import time
 import json
 import base64
-from browsermobproxy import Server
-from pprint import pprint
+from run import proxy
 
 SCRIPT = """var body = document.body,
             html = document.documentElement;
@@ -45,9 +44,7 @@ def collect_data(url, output_folder, output_filename):
     output_folder = os.path.join("./tmp", output_folder)
     if not os.path.exists(output_folder):
         os.mkdir(output_folder)
-    server = Server("utils/browsermob_proxy/bin/browsermob-proxy", options={'port': 8090})
-    server.start()
-    proxy = server.create_proxy()
+
     options = webdriver.ChromeOptions()
     options.add_argument("--start-maximized")
     options.add_argument("--force-device-scale-factor=2")
@@ -81,4 +78,3 @@ def collect_data(url, output_folder, output_filename):
         f.write(png)
     driver.execute_script("window.scrollTo(0, 0)")
     driver.close()
-    server.stop()

fred/run.py

@@ -8,6 +8,7 @@
 from endpoints.get_result import Result
 from apscheduler.schedulers.background import BackgroundScheduler
 from flask import Flask, request, send_from_directory
+from browsermobproxy import Server
 
 
 def clear_ended():
@@ -32,16 +33,16 @@ def after_request(response):
         response.headers["Expires"] = 0
         response.headers["Pragma"] = "no-cache"
         return response
-
+server = Server("utils/browsermob_proxy/bin/browsermob-proxy", options={'port': 8090})
+server.start()
+proxy = server.create_proxy()
 cors = CORS(app, resources={r"*": {"origins": "*"}})
 api = Api(app)
 api.add_resource(Verify, "/api/verify")
 api.add_resource(IDList, "/api/ids")
 api.add_resource(Shutdown, "/api/shutdown")
 api.add_resource(Result, "/api/result")
-# scheduler = BackgroundScheduler()
-# scheduler.add_job(func=clear_ended, trigger='interval', seconds=300)
-# scheduler.start()
 
 if __name__ == '__main__':
     app.run(host='0.0.0.0', debug=True)
+    server.stop()