analytics: go back to daemon implementation

Lack of a better way to spawn a detached process on both windows an linux
This commit is contained in:
Mr. Outis
2019-11-25 22:30:16 -06:00
parent 5cb437b5ef
commit 610d1ee28e
2 changed files with 30 additions and 4 deletions
+8 -3
View File
@@ -2,7 +2,6 @@ import json
import logging
import platform
import requests
import subprocess
import sys
import tempfile
import uuid
@@ -11,17 +10,23 @@ import distro
from dvc import __version__
from dvc.config import Config, to_bool
from dvc.daemon import daemon
from dvc.exceptions import NotDvcRepoError
from dvc.lock import Lock, LockError
from dvc.repo import Repo
from dvc.scm import SCM
from dvc.utils import env2bool, is_binary, makedirs
logger = logging.getLogger(__name__)
def collect_and_send_report(arguments=None, exit_code=None):
"""
Query the system to fill a report and send it on a detached process.
A temporary file is used as a mean of communication between the
current and detached process.
"""
report = {
"cmd_class": arguments.func.__name__,
"cmd_return_code": exit_code,
@@ -34,7 +39,7 @@ def collect_and_send_report(arguments=None, exit_code=None):
with tempfile.NamedTemporaryFile(delete=False, mode="w") as fobj:
json.dump(report, fobj)
subprocess.Popen(["python", "-m", "dvc.analytics", fobj.name])
daemon(["analytics", fobj.name])
def is_enabled():
+22 -1
View File
@@ -1,5 +1,7 @@
from __future__ import unicode_literals
import os
from dvc.command.base import CmdBaseNoRepo
from dvc.command.base import fix_subparsers
@@ -10,7 +12,6 @@ class CmdDaemonBase(CmdBaseNoRepo):
class CmdDaemonUpdater(CmdDaemonBase):
def run(self):
import os
from dvc.repo import Repo
from dvc.updater import Updater
@@ -22,6 +23,16 @@ class CmdDaemonUpdater(CmdDaemonBase):
return 0
class CmdDaemonAnalytics(CmdDaemonBase):
def run(self):
from dvc import analytics
analytics.send(self.args.target)
os.path.remove(self.args.target)
return 0
def add_parser(subparsers, parent_parser):
DAEMON_HELP = "Service daemon."
daemon_parser = subparsers.add_parser(
@@ -45,3 +56,13 @@ def add_parser(subparsers, parent_parser):
help=DAEMON_UPDATER_HELP,
)
daemon_updater_parser.set_defaults(func=CmdDaemonUpdater)
DAEMON_ANALYTICS_HELP = "Send dvc usage analytics."
daemon_analytics_parser = daemon_subparsers.add_parser(
"analytics",
parents=[parent_parser],
description=DAEMON_ANALYTICS_HELP,
help=DAEMON_ANALYTICS_HELP,
)
daemon_analytics_parser.add_argument("target", help="Analytics file.")
daemon_analytics_parser.set_defaults(func=CmdDaemonAnalytics)