lavatech/rana-cli
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #31 from gandarez/master

Browse source 
Added X-Machine-Name header
This commit is contained in:
Alan Hamlett 2015-07-03 22:41:23 -07:00
commit f10faca3ee
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wakatime/base.py
View file

@ -19,6 +19,7 @@ import re
import sys import sys
import time import time
import traceback import traceback
import socket
try: try:
import ConfigParser as configparser import ConfigParser as configparser
except ImportError: except ImportError:
@ -161,6 +162,7 @@ def parseArguments(argv):
help='optional project name') help='optional project name')
parser.add_argument('--alternate-project', dest='alternate_project', parser.add_argument('--alternate-project', dest='alternate_project',
help='optional alternate project name; auto-discovered project takes priority') help='optional alternate project name; auto-discovered project takes priority')
parser.add_argument('--workplace', dest='workplace', help='workplace you are currently logging.')
parser.add_argument('--disableoffline', dest='offline', parser.add_argument('--disableoffline', dest='offline',
action='store_false', action='store_false',
help='disables offline time logging instead of queuing logged time') help='disables offline time logging instead of queuing logged time')
@ -302,8 +304,10 @@ def get_user_agent(plugin):
) )
return user_agent return user_agent
def get_hostname():
return socket.gethostname()
def send_heartbeat(project=None, branch=None, stats={}, key=None, targetFile=None, def send_heartbeat(project=None, branch=None, workplace=None, stats={}, key=None, targetFile=None,
timestamp=None, isWrite=None, plugin=None, offline=None, notfile=False, timestamp=None, isWrite=None, plugin=None, offline=None, notfile=False,
hidefilenames=None, proxy=None, api_url=None, **kwargs): hidefilenames=None, proxy=None, api_url=None, **kwargs):
"""Sends heartbeat as POST request to WakaTime api server. """Sends heartbeat as POST request to WakaTime api server.
@ -350,7 +354,9 @@ def send_heartbeat(project=None, branch=None, stats={}, key=None, targetFile=Non
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json', 'Accept': 'application/json',
'Authorization': auth, 'Authorization': auth,
'X-Machine-Name': workplace
} }
log.debug(headers)
proxies = {} proxies = {}
if proxy: if proxy:
proxies['https'] = proxy proxies['https'] = proxy
@ -447,10 +453,15 @@ def main(argv=None):
if not args.notfile: if not args.notfile:
project, branch = get_project_info(configs=configs, args=args) project, branch = get_project_info(configs=configs, args=args)
workplace = args.workplace
if not args.workplace:
workplace = get_hostname()
kwargs = vars(args) kwargs = vars(args)
kwargs['project'] = project kwargs['project'] = project
kwargs['branch'] = branch kwargs['branch'] = branch
kwargs['stats'] = stats kwargs['stats'] = stats
kwargs['workplace'] = workplace
if send_heartbeat(**kwargs): if send_heartbeat(**kwargs):
queue = Queue() queue = Queue()
@ -463,6 +474,7 @@ def main(argv=None):
targetFile=heartbeat['file'], targetFile=heartbeat['file'],
timestamp=heartbeat['time'], timestamp=heartbeat['time'],
branch=heartbeat['branch'], branch=heartbeat['branch'],
workplace=heartbeat['workplace'],
stats=json.loads(heartbeat['stats']), stats=json.loads(heartbeat['stats']),
key=args.key, key=args.key,
isWrite=heartbeat['is_write'], isWrite=heartbeat['is_write'],