X Tutup
Skip to content

Commit 1e4ae65

Browse files
leandrotoledoleandrotoledo
committed
Changing INFO logs to DEBUG and minor fixes
1 parent fd17077 commit 1e4ae65

File tree

9 files changed

+41
-45
lines changed

9 files changed

+41
-45
lines changed

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DEFAULT_GOAL := help
12
.PHONY: clean pep8 lint test install
23

34
PYLINT := pylint

‎telegram/bot.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
from telegram.utils import request
3030
from telegram.utils.validate import validate_string
3131

32-
H = NullHandler()
33-
logging.getLogger(__name__).addHandler(H)
32+
logging.getLogger(__name__).addHandler(NullHandler())
3433

3534

3635
class Bot(TelegramObject):
@@ -797,7 +796,7 @@ def getUpdates(self,
797796
result = request.post(url, data, network_delay=network_delay)
798797

799798
if result:
800-
self.logger.info(
799+
self.logger.debug(
801800
'Getting updates: %s', [u['update_id'] for u in result])
802801
else:
803802
self.logger.debug('No new updates found.')

‎telegram/ext/dispatcher.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
from telegram import (TelegramError, Update, NullHandler)
3030
from telegram.ext.updatequeue import Empty
3131

32-
H = NullHandler()
33-
logging.getLogger(__name__).addHandler(H)
32+
logging.getLogger(__name__).addHandler(NullHandler())
3433

3534
semaphore = None
3635
async_threads = set()
@@ -158,7 +157,7 @@ def __init__(self, bot, update_queue, workers=4, exception_event=None):
158157
if not semaphore:
159158
semaphore = BoundedSemaphore(value=workers)
160159
else:
161-
self.logger.info("Semaphore already initialized, skipping.")
160+
self.logger.debug('Semaphore already initialized, skipping.')
162161

163162
def start(self):
164163
"""
@@ -176,15 +175,15 @@ def start(self):
176175
raise TelegramError(msg)
177176

178177
self.running = True
179-
self.logger.info('Dispatcher started')
178+
self.logger.debug('Dispatcher started')
180179

181180
while 1:
182181
try:
183182
# Pop update from update queue.
184183
update, context = self.update_queue.get(True, 1, True)
185184
except Empty:
186185
if self.__stop_event.is_set():
187-
self.logger.info('orderly stopping')
186+
self.logger.debug('orderly stopping')
188187
break
189188
elif self.__stop_event.is_set():
190189
self.logger.critical(
@@ -214,7 +213,7 @@ def start(self):
214213
"processing an update")
215214

216215
self.running = False
217-
self.logger.info('Dispatcher thread stopped')
216+
self.logger.debug('Dispatcher thread stopped')
218217

219218
def stop(self):
220219
"""

‎telegram/ext/jobqueue.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ def put(self,
8686

8787
next_t += time.time()
8888

89-
self.logger.debug("Putting a %s with t=%f" % (job.name, next_t))
89+
self.logger.debug('Putting a %s with t=%f' % (job.name, next_t))
9090
self.queue.put((next_t, job))
9191

9292
if not self.running and not prevent_autostart:
93-
self.logger.info("Auto-starting JobQueue")
93+
self.logger.debug('Auto-starting JobQueue')
9494
self.start()
9595

9696
def tick(self):
@@ -99,24 +99,24 @@ def tick(self):
9999
"""
100100
now = time.time()
101101

102-
self.logger.debug("Ticking jobs with t=%f" % now)
102+
self.logger.debug('Ticking jobs with t=%f' % now)
103103
while not self.queue.empty():
104104
t, j = self.queue.queue[0]
105-
self.logger.debug("Peeked at %s with t=%f" % (j.name, t))
105+
self.logger.debug('Peeked at %s with t=%f' % (j.name, t))
106106

107107
if t < now:
108108
self.queue.get()
109-
self.logger.info("Running job %s" % j.name)
109+
self.logger.debug('Running job %s' % j.name)
110110
try:
111111
j.run(self.bot)
112112
except:
113-
self.logger.exception("An uncaught error was raised while "
114-
"executing job %s" % j.name)
113+
self.logger.exception('An uncaught error was raised while '
114+
'executing job %s' % j.name)
115115
if j.repeat:
116116
self.put(j.run, j.interval)
117117
continue
118118

119-
self.logger.debug("Next task isn't due yet. Finished!")
119+
self.logger.debug('Next task isn\'t due yet. Finished!')
120120
break
121121

122122
def start(self):
@@ -130,7 +130,7 @@ def start(self):
130130
job_queue_thread = Thread(target=self._start,
131131
name="job_queue")
132132
job_queue_thread.start()
133-
self.logger.info('Job Queue thread started')
133+
self.logger.debug('Job Queue thread started')
134134
else:
135135
self.__lock.release()
136136

@@ -143,7 +143,7 @@ def _start(self):
143143
self.tick()
144144
time.sleep(self.tick_interval)
145145

146-
self.logger.info('Job Queue thread stopped')
146+
self.logger.debug('Job Queue thread stopped')
147147

148148
def stop(self):
149149
"""

‎telegram/ext/updater.py‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
from telegram.ext import dispatcher, Dispatcher, JobQueue, UpdateQueue
3333
from telegram.utils.webhookhandler import (WebhookServer, WebhookHandler)
3434

35-
H = NullHandler()
36-
logging.getLogger(__name__).addHandler(H)
35+
logging.getLogger(__name__).addHandler(NullHandler())
3736

3837

3938
class Updater:
@@ -194,7 +193,7 @@ def _start_polling(self, poll_interval, timeout, network_delay):
194193
"""
195194

196195
cur_interval = poll_interval
197-
self.logger.info('Updater thread started')
196+
self.logger.debug('Updater thread started')
198197

199198
# Remove webhook
200199
self.bot.setWebhook(webhook_url=None)
@@ -216,8 +215,8 @@ def _start_polling(self, poll_interval, timeout, network_delay):
216215
else:
217216
if not self.running:
218217
if len(updates) > 0:
219-
self.logger.info('Updates ignored and will be pulled '
220-
'again on restart.')
218+
self.logger.debug('Updates ignored and will be pulled '
219+
'again on restart.')
221220
break
222221

223222
if updates:
@@ -241,7 +240,7 @@ def _increase_poll_interval(current_interval):
241240
return current_interval
242241

243242
def _start_webhook(self, listen, port, url_path, cert, key):
244-
self.logger.info('Updater thread started')
243+
self.logger.debug('Updater thread started')
245244
use_ssl = cert is not None and key is not None
246245
url_path = "/%s" % url_path
247246

@@ -274,7 +273,7 @@ def _start_webhook(self, listen, port, url_path, cert, key):
274273
self.httpd.serve_forever(poll_interval=1)
275274

276275
def _clean_updates(self):
277-
self.logger.info('Cleaning updates from Telegram server')
276+
self.logger.debug('Cleaning updates from Telegram server')
278277
updates = self.bot.getUpdates()
279278
while updates:
280279
updates = self.bot.getUpdates(updates[-1].update_id + 1)
@@ -287,7 +286,7 @@ def stop(self):
287286
self.job_queue.stop()
288287
with self.__lock:
289288
if self.running:
290-
self.logger.info('Stopping Updater and Dispatcher...')
289+
self.logger.debug('Stopping Updater and Dispatcher...')
291290

292291
self.running = False
293292

@@ -301,31 +300,31 @@ def stop(self):
301300

302301
def _stop_httpd(self):
303302
if self.httpd:
304-
self.logger.info(
303+
self.logger.debug(
305304
'Waiting for current webhook connection to be '
306305
'closed... Send a Telegram message to the bot to exit '
307306
'immediately.')
308307
self.httpd.shutdown()
309308
self.httpd = None
310309

311310
def _stop_dispatcher(self):
312-
self.logger.debug("Requesting Dispatcher to stop...")
311+
self.logger.debug('Requesting Dispatcher to stop...')
313312
self.dispatcher.stop()
314313

315314
def _join_async_threads(self):
316315
with dispatcher.async_lock:
317316
threads = list(dispatcher.async_threads)
318317
total = len(threads)
319318
for i, thr in enumerate(threads):
320-
self.logger.info(
319+
self.logger.debug(
321320
'Waiting for async thread {0}/{1} to end'.format(i, total))
322321
thr.join()
323322
self.logger.debug(
324323
'async thread {0}/{1} has ended'.format(i, total))
325324

326325
def _join_threads(self):
327326
for thr in self.__threads:
328-
self.logger.info(
327+
self.logger.debug(
329328
'Waiting for {0} thread to end'.format(thr.name))
330329
thr.join()
331330
self.logger.debug('{0} thread has ended'.format(thr.name))

‎telegram/utils/botan.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
from urllib import quote
1313
from urllib2 import URLError, HTTPError
1414

15-
H = NullHandler()
16-
logging.getLogger(__name__).addHandler(H)
15+
logging.getLogger(__name__).addHandler(NullHandler())
1716

1817

1918
class Botan(object):

‎telegram/utils/request.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def decorator(*args, **kwargs):
9898

9999
except (SSLError, socket.timeout) as error:
100100
err_s = str(error)
101-
if "operation timed out" in err_s:
101+
if 'operation timed out' in err_s:
102102
raise TimedOut()
103103

104104
raise NetworkError(err_s)

‎telegram/utils/validate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ def validate_string(arg, name):
3535
name (str): The name of the argument, for the error message
3636
"""
3737
if not isinstance(arg, basestring) and arg is not None:
38-
raise ValueError(name + " is not a string")
38+
raise ValueError(name + ' is not a string')

‎telegram/utils/webhookhandler.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import http.server as BaseHTTPServer
1111

1212

13-
H = NullHandler()
14-
logging.getLogger(__name__).addHandler(H)
13+
logging.getLogger(__name__).addHandler(NullHandler())
1514

1615

1716
class _InvalidPost(Exception):
@@ -36,14 +35,14 @@ def __init__(self, server_address, RequestHandlerClass, update_queue,
3635
def serve_forever(self, poll_interval=0.5):
3736
with self.server_lock:
3837
self.is_running = True
39-
self.logger.info("Webhook Server started.")
38+
self.logger.debug('Webhook Server started.')
4039
super(WebhookServer, self).serve_forever(poll_interval)
41-
self.logger.info("Webhook Server stopped.")
40+
self.logger.debug('Webhook Server stopped.')
4241

4342
def shutdown(self):
4443
with self.shutdown_lock:
4544
if not self.is_running:
46-
self.logger.warn("Webhook Server already stopped.")
45+
self.logger.warn('Webhook Server already stopped.')
4746
return
4847
else:
4948
super(WebhookServer, self).shutdown()
@@ -54,7 +53,7 @@ def shutdown(self):
5453
# Based on: https://github.com/eternnoir/pyTelegramBotAPI/blob/master/
5554
# examples/webhook_examples/webhook_cpython_echo_bot.py
5655
class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler, object):
57-
server_version = "WebhookHandler/1.0"
56+
server_version = 'WebhookHandler/1.0'
5857

5958
def __init__(self, request, client_address, server):
6059
self.logger = logging.getLogger(__name__)
@@ -69,7 +68,7 @@ def do_GET(self):
6968
self.end_headers()
7069

7170
def do_POST(self):
72-
self.logger.debug("Webhook triggered")
71+
self.logger.debug('Webhook triggered')
7372
try:
7473
self._validate_post()
7574
clen = self._get_content_len()
@@ -83,11 +82,11 @@ def do_POST(self):
8382
self.send_response(200)
8483
self.end_headers()
8584

86-
self.logger.debug("Webhook received data: " + json_string)
85+
self.logger.debug('Webhook received data: ' + json_string)
8786

8887
update = Update.de_json(json.loads(json_string))
89-
self.logger.info("Received Update with ID %d on Webhook" %
90-
update.update_id)
88+
self.logger.debug('Received Update with ID %d on Webhook' %
89+
update.update_id)
9190
self.server.update_queue.put(update)
9291

9392
def _validate_post(self):

0 commit comments

Comments
 (0)
X Tutup