gomyck-tools 1.1.4__tar.gz → 1.1.5__tar.gz

{gomyck-tools-1.1.4 → gomyck-tools-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.1.4
+Version: 1.1.5
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck

{gomyck-tools-1.1.4 → gomyck-tools-1.1.5}/ctools/ckafka.py

@@ -66,7 +66,7 @@ class KafkaInstance:
         self.consumer.subscribe(self.consumer_callback.keys())
       self.consumer_callback[topic].append(callBack)
     if not self.start_consumer:
-      t = Thread(target=self._start_consumer_poll, daemon=True)
+      t = Thread(target=self._start_consumer_poll, daemon=False)
       t.start()
 
   def _start_consumer_poll(self):
@@ -101,7 +101,7 @@ class CKafka:
     self.password = password
 
   def init_producer(self, acks=1) -> KafkaInstance:
-    print("[ Producer ] Connecting to Kafka brokers")
+    print("[ Producer ] Connecting to Kafka [{}]".format(self.kafka_url))
     for i in range(0, 6):
       try:
         if self.secure:
@@ -120,15 +120,15 @@ class CKafka:
             bootstrap_servers=self.kafka_url,
             value_serializer=lambda x: dumps(x).encode('utf-8')
           )
-        print("[ Producer ] Connected to Kafka...")
+        print("[ Producer ] Success Connected to Kafka [{}]".format(self.kafka_url))
         return KafkaInstance(producer=producer, consumer=None)
       except errors.NoBrokersAvailable:
-        print("[ Producer ] Waiting for brokers to become available...")
+        print("[ Producer ] Waiting for Kafka [{}] to become available...".format(self.kafka_url))
         time.sleep(3)
-    raise RuntimeError("[ Producer ] Failed to connect to brokers within 60 seconds")
+    raise RuntimeError("[ Producer ] Failed to connect to Kafka [{}] within 60 seconds".format(self.kafka_url))
 
   def init_consumer(self, client_id: str = 'ck-py-kafka-consumer', consumer_group: str = 'ck-py-kafka-consumer', enable_auto_commit: bool = True) -> KafkaInstance:
-    print("[ Consumer ] Connecting to Kafka brokers")
+    print("[ Consumer ] Connecting to Kafka [{}]".format(self.kafka_url))
     for i in range(0, 6):
       try:
         if self.secure:
@@ -151,9 +151,9 @@ class CKafka:
             bootstrap_servers=self.kafka_url,
             value_deserializer=lambda x: x.decode('utf-8')
           )
-        print("[ Consumer ] Connected to Kafka...")
+        print("[ Consumer ] Success Connected to Kafka [{}]".format(self.kafka_url))
         return KafkaInstance(producer=None, consumer=consumer)
       except errors.NoBrokersAvailable:
-        print("[ Consumer ] Waiting for brokers to become available...")
+        print("[ Consumer ] Waiting for Kafka [{}] to become available...".format(self.kafka_url))
         time.sleep(3)
-    raise RuntimeError("[ Consumer ] Failed to connect to brokers within 60 seconds")
+    raise RuntimeError("[ Consumer ] Failed to connect to Kafka [{}] within 60 seconds".format(self.kafka_url))

{gomyck-tools-1.1.4 → gomyck-tools-1.1.5}/ctools/id_worker_tools.py

@@ -4,28 +4,22 @@ import time
 WORKER_ID_BITS = 5
 DATACENTER_ID_BITS = 5
 SEQUENCE_BITS = 12
-
 # 最大取值计算
 MAX_WORKER_ID = -1 ^ (-1 << WORKER_ID_BITS)  # 2**5-1 0b11111
 MAX_DATACENTER_ID = -1 ^ (-1 << DATACENTER_ID_BITS)
-
 # 移位偏移计算
 WOKER_ID_SHIFT = SEQUENCE_BITS
 DATACENTER_ID_SHIFT = SEQUENCE_BITS + WORKER_ID_BITS
 TIMESTAMP_LEFT_SHIFT = SEQUENCE_BITS + WORKER_ID_BITS + DATACENTER_ID_BITS
-
 # 序号循环掩码
 SEQUENCE_MASK = -1 ^ (-1 << SEQUENCE_BITS)
-
 # Twitter元年时间戳
 TWEPOCH = 1288834974657
 
-
 class IdWorker(object):
   """
   用于生成IDs
   """
-
   def __init__(self, datacenter_id, worker_id, sequence=0):
     """
     初始化
@@ -36,17 +30,15 @@ class IdWorker(object):
     # sanity check
     if worker_id > MAX_WORKER_ID or worker_id < 0:
       raise ValueError('worker_id值越界')
-
     if datacenter_id > MAX_DATACENTER_ID or datacenter_id < 0:
       raise ValueError('datacenter_id值越界')
-
     self.worker_id = worker_id
     self.datacenter_id = datacenter_id
     self.sequence = sequence
-
     self.last_timestamp = -1  # 上次计算的时间戳
 
-  def _gen_timestamp(self):
+  @staticmethod
+  def _gen_timestamp():
     """
     生成整数时间戳
     :return:int timestamp
@@ -59,21 +51,17 @@ class IdWorker(object):
     :return:
     """
     timestamp = self._gen_timestamp()
-
     # 时钟回拨
     if timestamp < self.last_timestamp:
       print('clock is moving backwards. Rejecting requests until {}'.format(self.last_timestamp))
       raise
-
     if timestamp == self.last_timestamp:
       self.sequence = (self.sequence + 1) & SEQUENCE_MASK
       if self.sequence == 0:
         timestamp = self._til_next_millis(self.last_timestamp)
     else:
       self.sequence = 0
-
     self.last_timestamp = timestamp
-
     new_id = ((timestamp - TWEPOCH) << TIMESTAMP_LEFT_SHIFT) | (self.datacenter_id << DATACENTER_ID_SHIFT) | \
              (self.worker_id << WOKER_ID_SHIFT) | self.sequence
     return new_id

{gomyck-tools-1.1.4 → gomyck-tools-1.1.5}/gomyck_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.1.4
+Version: 1.1.5
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck

{gomyck-tools-1.1.4 → gomyck-tools-1.1.5}/setup.py

@@ -11,7 +11,7 @@ requirements = parse_requirements(os.path.join(os.path.dirname(__file__), 'requi
 
 setup(
   name="gomyck-tools",
-  version="1.1.4",
+  version="1.1.5",
   author="gomyck",
   author_email="hao474798383@163.com",
   description="A ctools for python development by hao474798383",