aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2016-06-17 03:24:58 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2016-06-17 03:24:58 +0300
commit2c25de11d1db0621a6d21a2f3d12245304bfdc31 (patch)
treed5ff5ab973c4c4e139467cfae818118223070356
parentadd the platform a user was "last seen" using (diff)
downloadvk-scripts-2c25de11d1db0621a6d21a2f3d12245304bfdc31.tar.gz
vk-scripts-2c25de11d1db0621a6d21a2f3d12245304bfdc31.zip
make the status logger a database writer
Diffstat (limited to '')
-rw-r--r--track_status.py17
-rw-r--r--vk/utils/tracking/__init__.py3
-rw-r--r--vk/utils/tracking/db/writer/__init__.py2
-rw-r--r--vk/utils/tracking/db/writer/log.py (renamed from vk/utils/tracking/logger.py)8
4 files changed, 12 insertions, 18 deletions
diff --git a/track_status.py b/track_status.py
index 8f164b7..9935b64 100644
--- a/track_status.py
+++ b/track_status.py
@@ -3,11 +3,11 @@
# See LICENSE.txt for details.
import vk.api
-from vk.utils.tracking import Logger, StatusTracker
+from vk.utils.tracking import StatusTracker
from vk.utils.tracking.db.writer import *
if __name__ == '__main__':
- import argparse, sys
+ import argparse, logging, sys
def natural_number(s):
x = int(s)
@@ -31,14 +31,17 @@ if __name__ == '__main__':
args = parser.parse_args()
- Logger.set_up(args.log)
+ logging.basicConfig(format='[%(asctime)s] %(message)s',
+ stream=args.log,
+ level=logging.INFO,
+ datefmt='%Y-%m-%d %H:%M:%S')
api = vk.api.API(vk.api.Language.EN)
tracker = StatusTracker(api, args.timeout)
- tracker.add_initial_status_handler(Logger.on_initial_status)
- tracker.add_status_update_handler(Logger.on_status_update)
- tracker.add_connection_error_handler(Logger.on_exception)
+ tracker.add_initial_status_handler(log.Logger.on_initial_status)
+ tracker.add_status_update_handler(log.Logger.on_status_update)
+ tracker.add_connection_error_handler(log.Logger.on_exception)
with csv.Writer(args.output) as csv_writer:
@@ -49,5 +52,5 @@ if __name__ == '__main__':
try:
tracker.loop(args.uids)
except Exception as e:
- Logger.on_exception(e)
+ logging.exception(e)
sys.exit(1)
diff --git a/vk/utils/tracking/__init__.py b/vk/utils/tracking/__init__.py
index 641d4c8..2e8b02e 100644
--- a/vk/utils/tracking/__init__.py
+++ b/vk/utils/tracking/__init__.py
@@ -2,7 +2,6 @@
# This file is licensed under the terms of the MIT License.
# See LICENSE.txt for details.
-from .logger import Logger
from .status_tracker import StatusTracker
-__all__ = 'logger', 'status_tracker',
+__all__ = 'status_tracker',
diff --git a/vk/utils/tracking/db/writer/__init__.py b/vk/utils/tracking/db/writer/__init__.py
index 330d5a8..8eb62e1 100644
--- a/vk/utils/tracking/db/writer/__init__.py
+++ b/vk/utils/tracking/db/writer/__init__.py
@@ -2,4 +2,4 @@
# This file is licensed under the terms of the MIT License.
# See LICENSE.txt for details.
-__all__ = 'csv',
+__all__ = 'csv', 'log'
diff --git a/vk/utils/tracking/logger.py b/vk/utils/tracking/db/writer/log.py
index 8da418a..02697b7 100644
--- a/vk/utils/tracking/logger.py
+++ b/vk/utils/tracking/db/writer/log.py
@@ -3,17 +3,9 @@
# See LICENSE.txt for details.
import logging
-import sys
class Logger:
@staticmethod
- def set_up(fd=sys.stdout):
- logging.basicConfig(format='[%(asctime)s] %(message)s',
- stream=fd,
- level=logging.INFO,
- datefmt='%Y-%m-%d %H:%M:%S')
-
- @staticmethod
def on_initial_status(user):
if user.is_online():
logging.info(Logger._format_user_is_online(user))