div. updates

__init__.py

@@ -1,40 +1,12 @@
 import os
 import sys
+import lockfile
+#from lockfile import LockFile
 package_directory = os.path.dirname(os.path.abspath(__file__))
 from config import Config
 
 cfg = Config(file(os.path.join(package_directory, 'config.cfg')))
 #--------------- Logging
-import logging
-
-file_handler=logging.FileHandler(cfg.logfile)
-file_handler.setLevel(logging.DEBUG)
-stream_handler=logging.StreamHandler(sys.stdout)
-stream_handler.setLevel(logging.DEBUG)
-
-clt=logging.getLogger('mylogger')
-clt.setLevel(logging.DEBUG)
-clt.addHandler(file_handler)
-clt.addHandler(stream_handler)
-
-clogger=clt
-#----------------
-download_path=cfg.download_path
-
-lg=clt
-
-from gevent import spawn, monkey
-monkey.patch_all()
-from .compiler import start_workers
-#start_workers(1,1,1)
-
-
-if cfg.bot_active:
-    from src.bot import bot
-    #if not app.debug or os.environ.get("WERKZEUG_RUN_MAIN") == "true":
-    bot.message_loop()
-
-
 
 
 # Framework
@@ -43,16 +15,66 @@ from flask import Flask, jsonify, render_template, redirect, request,send_from_d
 from flask_cors import CORS, cross_origin
 #Authentication
 from flask_jwt import JWT, jwt_required, current_identity
+import logging
+
+
+app = Flask(__name__)
+
+file_handler=logging.FileHandler(cfg.logfile)
+file_handler.setLevel(logging.DEBUG)
+stream_handler=logging.StreamHandler(sys.stdout)
+stream_handler.setLevel(logging.DEBUG)
+
+CORS(app)
+clt=logging.getLogger('mylogger')
+clt.setLevel(logging.DEBUG)
+clt.addHandler(file_handler)
+clt.addHandler(stream_handler)
+lg=clt
+
+#clogger=clt
+#----------------
+
+#app.config['LOGGER_NAME']='mylogger'
+app.logger.setLevel(logging.DEBUG)
+app.logger.info("Server Started")
+app.logger.setLevel(logging.DEBUG)
+app.logger.addHandler(file_handler)
+app.logger.addHandler(stream_handler)
+
+clogger=app.logger
+
+
+
+
+
+download_path=cfg.download_path
+
 
 from src.models import Article,Section
 from src.users import authenticate, identity
 from datetime import datetime
 
-app = Flask(__name__)
-CORS(app)
-app.config['LOGGER_NAME']='mylogger'
-app.logger.setLevel(logging.DEBUG)
-app.logger.info("Server Started")
+
+from gevent import spawn, monkey
+monkey.patch_all()
+from .compiler import start_workers
+#start_workers(1,1,1)
+
+
+lock = lockfile.LockFile("/srv/crawlerapi/bot.lock")
+
+try:
+    if cfg.bot_active and not lock.is_locked():
+        lock.acquire()
+        from src.bot import bot
+        #if not app.debug or os.environ.get("WERKZEUG_RUN_MAIN") == "true":
+        bot.message_loop()
+except lockfile.Error:
+    clogger.info("Couldn't Lock the bot file")
+
+
+
 
 app.config['SECRET_KEY'] = 'super-secret'
 import flask