From d0324d5f58091e9982b2031b73d1b6737eb4f174 Mon Sep 17 00:00:00 2001 From: wuaho Date: Tue, 25 May 2021 20:07:15 +0800 Subject: [PATCH] 1 --- single_process.py | 2 +- v2/event_attr.py | 6 ++++-- v2/transmitter.py | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/single_process.py b/single_process.py index 03cfa98..cdd4a4a 100644 --- a/single_process.py +++ b/single_process.py @@ -35,7 +35,7 @@ def run(): ts = int(time.time()) if 'user' in type_: - continue + # continue obj = getattr(handler_user, type_) handler_user.receive_data.append(UserAct(obj, msg)) if len(handler_user.receive_data) >= 1000 or last_ts + 60 < ts: diff --git a/v2/event_attr.py b/v2/event_attr.py index 1c0648c..aa2c4c6 100644 --- a/v2/event_attr.py +++ b/v2/event_attr.py @@ -10,11 +10,12 @@ class EventAttr: def get_event_attr(self, key): attr = self.event_attr.get(key) if not attr: - self.event_attr[key] = self.rdb.get(key) or set() + self.event_attr[key] = self.rdb.smembers(key) or set() return self.event_attr[key] def set_event_attr(self, key, *data): - self.event_attr[key] = self.rdb.sadd(key, *data) + self.rdb.sadd(key, *data) + self.event_attr[key] = data def check_attr(self, db, data): event_name = data.get('#event_name') @@ -26,5 +27,6 @@ class EventAttr: attr = self.get_event_attr(key) data_attr = set(data) extra_attr = data_attr - attr + if extra_attr: self.set_event_attr(key, *extra_attr) diff --git a/v2/transmitter.py b/v2/transmitter.py index 3c5190f..b54cf5f 100644 --- a/v2/transmitter.py +++ b/v2/transmitter.py @@ -103,6 +103,6 @@ class Transmitter: self.check_type(self.db_name, tb, data) self.set_event_attr(self.db_name, tb, data) self.__send(self.db_name, tb, [json.dumps(item) for item in data]) - except: - pass + except Exception as e: + self.log.eror(e) buffer.clear()