Index: cloud_sync.py
===================================================================
diff -u -r3b80d8631090f72584ae2a309efcea2d20b4f62e -r4ebf654ab1b0d436ce7d171bfe06c6bdc46aca47
--- cloud_sync.py	(.../cloud_sync.py)	(revision 3b80d8631090f72584ae2a309efcea2d20b4f62e)
+++ cloud_sync.py	(.../cloud_sync.py)	(revision 4ebf654ab1b0d436ce7d171bfe06c6bdc46aca47)
@@ -5,24 +5,31 @@
 import socket
 import sys
 
+import werkzeug
+werkzeug.cached_property = werkzeug.utils.cached_property
+
 from flask import Flask, Response, request
 from flask_restplus import Api, Resource, fields, reqparse
 
 from cloudsync.utils.helpers import *
 from cloudsync.utils.globals import *
 from cloudsync.utils.reachability import ReachabilityProvider
 from cloudsync.busses.file_output_bus import FileOutputBus
+from cloudsync.handlers.error_handler import ErrorHandler
 from cloudsync.handlers.cs_mft_dcs_request_handler import NetworkRequestHandler
 from cloudsync.handlers.ui_cs_request_handler import UICSMessageHandler
 from cloudsync.busses.file_input_bus import FileInputBus
 from cloudsync.utils.heartbeat import HeartBeatProvider
 
-VERSION = "0.2.4"
+VERSION = "0.2.6"
 
 arguments = sys.argv
 log_level = int(arguments[1])
 
-logging.basicConfig(filename='cloudsync.log', level=log_level)
+logging.basicConfig(filename='cloudsync.log',
+                    level=log_level,
+                    format='[%(asctime)s]: %(levelname)s - %(message)s | {%(pathname)s:%(lineno)d}',
+                    )
 
 app = Flask(__name__)
 api = Api(app=app, version=VERSION, title="CloudSync Registration API",
@@ -35,7 +42,7 @@
 default_formatter = logging.Formatter('[%(asctime)s] %(levelname)s in %(module)s: %(message)s')
 handler.setFormatter(default_formatter)
 
-app.logger.addHandler(handler)
+# app.logger.addHandler(handler)
 app.logger.setLevel(log_level)
 
 g_utils.add_logger(app.logger)
@@ -46,12 +53,16 @@
 
 g_utils.add_reachability_provider(reachability_provider=reachability_provider)
 
-output_channel = FileOutputBus(logger=app.logger, max_size=1, file_channels_path=UI2CS_FILE_CHANNELS_PATH)
+output_channel = FileOutputBus(logger=app.logger, max_size=100, file_channels_path=UI2CS_FILE_CHANNELS_PATH)
 
+error_handler = ErrorHandler(logger=app.logger, max_size=100, output_channel=output_channel)
+
 network_request_handler = NetworkRequestHandler(logger=app.logger, max_size=1, output_channel=output_channel,
-                                                reachability_provider=reachability_provider)
+                                                reachability_provider=reachability_provider,
+                                                error_handler=error_handler)
 message_handler = UICSMessageHandler(logger=app.logger, max_size=20, network_request_handler=network_request_handler,
-                                     output_channel=output_channel, reachability_provider=reachability_provider)
+                                     output_channel=output_channel, reachability_provider=reachability_provider,
+                                     error_handler=error_handler)
 ui_cs_bus = FileInputBus(logger=app.logger, file_channels_path=UI2CS_FILE_CHANNELS_PATH, input_channel_name="inp.buf",
                          g_config=g_config, message_handler=message_handler)