Quellcode durchsuchen

地址改为linux下使用内网,修改启动间隔和错误日志打印

luojiehua vor 4 Jahren
Ursprung
Commit
a8a8e88bc8

+ 8 - 1
BaseDataMaintenance/dataSource/source.py

@@ -65,8 +65,15 @@ def getConnect_neo4j():
     # print(json.loads(json.dumps(finded.data())))
     # print(finded)
 
+import platform
+
+if platform.system()=="windows":
+    OTS_URL = "https://bxkc-ots.cn-hangzhou.ots.aliyuncs.com"
+else:
+    OTS_URL = "https://bxkc-ots.cn-hangzhou.ots-internal.aliyuncs.com"
+
 def getConnect_ots():
-    ots_client = tablestore.client.OTSClient('https://bxkc-ots.cn-hangzhou.ots.aliyuncs.com', 'LTAI4G2bwraGDYQ4S5hhCxht', 'k6Llfa0S1KuvYyU2cWchExdQjPGJOY',
+    ots_client = tablestore.client.OTSClient(OTS_URL, 'LTAI4G2bwraGDYQ4S5hhCxht', 'k6Llfa0S1KuvYyU2cWchExdQjPGJOY',
                                              'bxkc-ots', logger_name = 'table_store.log',
                                              retry_policy = tablestore.WriteRetryPolicy())
     return ots_client

+ 13 - 7
BaseDataMaintenance/maintenance/proposedBuilding/DataSynchronization.py

@@ -10,6 +10,7 @@ from apscheduler.schedulers.blocking import BlockingScheduler
 from BaseDataMaintenance.common.multiThread import MultiThreadHandler
 from BaseDataMaintenance.model.ots.proposedBuilding_tmp import proposedBuilding_tmp
 from BaseDataMaintenance.model.ots.designed_project import designed_project
+import traceback
 
 class DataSynchronization():
 
@@ -53,13 +54,18 @@ class DataSynchronization():
             #修改designed_project
             _project_dict = _proposed.toDesigned_project(ots_client)
 
-            if _project_dict is not None:
-                #更新数据
-                _designed_project = designed_project(_project_dict)
-                _designed_project.update_project(ots_client)
+            try:
+                if _project_dict is not None:
+                    #更新数据
+                    _designed_project = designed_project(_project_dict)
+                    _designed_project.update_project(ots_client)
+
+                #删除tmp
+                _proposed.delete_row(ots_client)
+            except Exception as e:
+                log("comsumer failed cause of %s"%(str(e)))
+                log(traceback.format_exc())
 
-            #删除tmp
-            _proposed.delete_row(ots_client)
 
 
             pool_ots.putConnector(ots_client)
@@ -93,7 +99,7 @@ class DataSynchronization():
 
     def scheduler(self):
         _scheduler = BlockingScheduler()
-        _scheduler.add_job(self.maxcompute2ots,"cron",minute="*/30")
+        _scheduler.add_job(self.maxcompute2ots,"cron",minute="*/10")
         _scheduler.start()
 
 def startSychro():

+ 8 - 1
BaseDataMaintenance/model/ots/BaseModel.py

@@ -66,12 +66,15 @@ class BaseModel():
         row = Row(primary_key)
         try:
             consumed, return_row = ots_client.delete_row(self.table_name, row, None)
-        # 客户端异常,一般为参数错误或者网络异常。
         except OTSClientError as e:
             log("update row failed, http_status:%d, error_message:%s" % (e.get_http_status(), e.get_error_message()))
+            raise e
         # 服务端异常,一般为参数错误或者流控错误。
         except OTSServiceError as e:
             log("update row failed, http_status:%d, error_code:%s, error_message:%s, request_id:%s" % (e.get_http_status(), e.get_error_code(), e.get_error_message(), e.get_request_id()))
+            raise e
+        except Exception as e:
+            raise e
         # log ('Delete succeed, consume %s write cu.' % consumed.write)
 
     def update_row(self,ots_client):
@@ -86,7 +89,11 @@ class BaseModel():
         # 客户端异常,一般为参数错误或者网络异常。
         except OTSClientError as e:
             log("update row failed, http_status:%d, error_message:%s" % (e.get_http_status(), e.get_error_message()))
+            raise e
         # 服务端异常,一般为参数错误或者流控错误。
         except OTSServiceError as e:
             log("update row failed, http_status:%d, error_code:%s, error_message:%s, request_id:%s" % (e.get_http_status(), e.get_error_code(), e.get_error_message(), e.get_request_id()))
+            raise e
+        except Exception as e:
+            raise e
         # log ('update succeed, consume %s write cu.' % consumed.write)

+ 1 - 8
BaseDataMaintenance/primarykey/startSnowflake.py

@@ -16,16 +16,9 @@ def get_guid():
         except Exception as e:
             pass
 
-LINUX_PATH = "/home/python/interface_real_new/ENV"
 
 def startSnowflake(port=None,worker=None):
-    import platform
-    if platform.system()=="Windows":
-        _cmd = "snowflake_start_server"
-    else:
-        _cmd = LINUX_PATH+"/bin/snowflake_start_server"
-        if not os.path.exists(_cmd):
-            _cmd = os.path.dirname(__file__)+"/../..//ENV/bin/snowflake_start_server"
+    _cmd = "snowflake_start_server"
     if worker is not None:
         _cmd += " --worker=%d"%worker
     if port is not None:

+ 6 - 3
test.py

@@ -1,5 +1,8 @@
 
-import sys
-import os
+def a():
+    try:
+        a = 1/0
+    except Exception as e:
+        pass
 
-print(os.path.dirname(sys.argv[0]))
+a()