From 040a76b93c19758d4f4fe9c0428f313194bcf255 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Tue, 12 May 2015 15:03:23 -0700 Subject: [PATCH] upgrade wakatime cli to v4.0.11 --- packages/wakatime/__about__.py | 2 +- packages/wakatime/base.py | 15 ++-- packages/wakatime/offlinequeue.py | 7 +- packages/wakatime/session_cache.py | 109 +++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 packages/wakatime/session_cache.py diff --git a/packages/wakatime/__about__.py b/packages/wakatime/__about__.py index 7969aba..a4ec680 100644 --- a/packages/wakatime/__about__.py +++ b/packages/wakatime/__about__.py @@ -1,7 +1,7 @@ __title__ = 'wakatime' __description__ = 'Common interface to the WakaTime api.' __url__ = 'https://github.com/wakatime/wakatime' -__version_info__ = ('4', '0', '10') +__version_info__ = ('4', '0', '11') __version__ = '.'.join(__version_info__) __author__ = 'Alan Hamlett' __author_email__ = 'alan@wakatime.com' diff --git a/packages/wakatime/base.py b/packages/wakatime/base.py index 9ac3d98..30186c8 100644 --- a/packages/wakatime/base.py +++ b/packages/wakatime/base.py @@ -29,14 +29,14 @@ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'pac from .__about__ import __version__ from .compat import u, open, is_py3 -from .offlinequeue import Queue from .logger import setup_logging -from .project import find_project -from .stats import get_file_stats +from .offlinequeue import Queue from .packages import argparse from .packages import simplejson as json -from .packages import requests from .packages.requests.exceptions import RequestException +from .project import find_project +from .session_cache import SessionCache +from .stats import get_file_stats try: from .packages import tzlocal except: @@ -360,10 +360,13 @@ def send_heartbeat(project=None, branch=None, stats={}, key=None, targetFile=Non if tz: headers['TimeZone'] = u(tz.zone) + session_cache = SessionCache() + session = session_cache.get() + # log time to api response = None try: - response = requests.post(api_url, data=request_body, headers=headers, + response = session.post(api_url, data=request_body, headers=headers, proxies=proxies) except RequestException: exception_data = { @@ -385,6 +388,7 @@ def send_heartbeat(project=None, branch=None, stats={}, key=None, targetFile=Non log.debug({ 'response_code': response_code, }) + session_cache.save(session) return True if offline: if response_code != 400: @@ -410,6 +414,7 @@ def send_heartbeat(project=None, branch=None, stats={}, key=None, targetFile=Non 'response_code': response_code, 'response_content': response_content, }) + session_cache.delete() return False diff --git a/packages/wakatime/offlinequeue.py b/packages/wakatime/offlinequeue.py index 2f57ab3..ebbc2d3 100644 --- a/packages/wakatime/offlinequeue.py +++ b/packages/wakatime/offlinequeue.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- """ - wakatime.queue - ~~~~~~~~~~~~~~ + wakatime.offlinequeue + ~~~~~~~~~~~~~~~~~~~~~ - Queue for offline time logging. - http://wakatime.com + Queue for saving heartbeats while offline. :copyright: (c) 2014 Alan Hamlett. :license: BSD, see LICENSE for more details. diff --git a/packages/wakatime/session_cache.py b/packages/wakatime/session_cache.py new file mode 100644 index 0000000..7986fa0 --- /dev/null +++ b/packages/wakatime/session_cache.py @@ -0,0 +1,109 @@ +# -*- coding: utf-8 -*- +""" + wakatime.session_cache + ~~~~~~~~~~~~~~~~~~~~~~ + + Persist requests.Session for multiprocess SSL handshake pooling. + + :copyright: (c) 2015 Alan Hamlett. + :license: BSD, see LICENSE for more details. +""" + + +import logging +import os +import pickle +import sys +import traceback + +try: + import sqlite3 + HAS_SQL = True +except ImportError: + HAS_SQL = False + +sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'packages')) + +from .packages import requests + + +log = logging.getLogger('WakaTime') + + +class SessionCache(object): + DB_FILE = os.path.join(os.path.expanduser('~'), '.wakatime.db') + + def connect(self): + conn = sqlite3.connect(self.DB_FILE) + c = conn.cursor() + c.execute('''CREATE TABLE IF NOT EXISTS session ( + value BLOB) + ''') + return (conn, c) + + + def save(self, session): + """Saves a requests.Session object for the next heartbeat process. + """ + + if not HAS_SQL: + return + try: + conn, c = self.connect() + c.execute('DELETE FROM session') + values = { + 'value': pickle.dumps(session), + } + c.execute('INSERT INTO session VALUES (:value)', values) + conn.commit() + conn.close() + except: + log.error(traceback.format_exc()) + + + def get(self): + """Returns a requests.Session object. + + Gets Session from sqlite3 cache or creates a new Session. + """ + + if not HAS_SQL: + return requests.session() + + try: + conn, c = self.connect() + except: + log.error(traceback.format_exc()) + return requests.session() + + session = None + try: + c.execute('BEGIN IMMEDIATE') + c.execute('SELECT value FROM session LIMIT 1') + row = c.fetchone() + if row is not None: + session = pickle.loads(row[0]) + except: + log.error(traceback.format_exc()) + + try: + conn.close() + except: + log.error(traceback.format_exc()) + + return session if session is not None else requests.session() + + + def delete(self): + """Clears all cached Session objects. + """ + + if not HAS_SQL: + return + try: + conn, c = self.connect() + c.execute('DELETE FROM session') + conn.commit() + conn.close() + except: + log.error(traceback.format_exc())