Skip to content

Commit 03b9d1b

Browse files
committed
Add timestamp to log messages
1 parent 5025f69 commit 03b9d1b

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

github_backup/github_backup.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import base64
88
import calendar
99
import codecs
10+
import datetime
1011
import errno
1112
import getpass
1213
import json
@@ -50,6 +51,10 @@
5051
FNULL = open(os.devnull, 'w')
5152

5253

54+
def _get_log_date():
55+
return datetime.datetime.isoformat(datetime.datetime.now())
56+
57+
5358
def log_error(message):
5459
"""
5560
Log message (str) or messages (List[str]) to stderr and exit with status 1
@@ -66,7 +71,7 @@ def log_info(message):
6671
message = [message]
6772

6873
for msg in message:
69-
sys.stdout.write("{0}\n".format(msg))
74+
sys.stdout.write("{0}: {1}\n".format(_get_log_date(), msg))
7075

7176

7277
def log_warning(message):
@@ -77,7 +82,7 @@ def log_warning(message):
7782
message = [message]
7883

7984
for msg in message:
80-
sys.stderr.write("{0}\n".format(msg))
85+
sys.stderr.write("{0}: {1}\n".format(_get_log_date(), msg))
8186

8287

8388
def logging_subprocess(popenargs,
@@ -437,7 +442,7 @@ def retrieve_data_gen(args, template, query_args=None, single_request=False):
437442

438443
retries = 0
439444
while retries < 3 and status_code == 502:
440-
print('API request returned HTTP 502: Bad Gateway. Retrying in 5 seconds')
445+
log_warning('API request returned HTTP 502: Bad Gateway. Retrying in 5 seconds')
441446
retries += 1
442447
time.sleep(5)
443448
request = _construct_request(per_page, page, query_args, template, auth, as_app=args.as_app) # noqa
@@ -544,12 +549,10 @@ def _request_http_error(exc, auth, errors):
544549
delta = max(10, reset - gm_now)
545550

546551
limit = headers.get('x-ratelimit-limit')
547-
print('Exceeded rate limit of {} requests; waiting {} seconds to reset'.format(limit, delta), # noqa
548-
file=sys.stderr)
552+
log_warning('Exceeded rate limit of {} requests; waiting {} seconds to reset'.format(limit, delta)) # noqa
549553

550554
if auth is None:
551-
print('Hint: Authenticate to raise your GitHub rate limit',
552-
file=sys.stderr)
555+
log_info('Hint: Authenticate to raise your GitHub rate limit')
553556

554557
time.sleep(delta)
555558
should_continue = True

0 commit comments

Comments
 (0)