Skip to content

Commit

Permalink
Merge pull request #26418 from davidlange6/190410_commands
Browse files Browse the repository at this point in the history
migrate away from commands in das utility
  • Loading branch information
cmsbuild committed Apr 10, 2019
2 parents 00212db + 2f334a2 commit f4806ec
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Utilities/General/python/cmssw_das_client.py
@@ -1,8 +1,8 @@
from commands import getstatusoutput
import time
import os
from json import loads, dumps
from types import GeneratorType
import subprocess

#Copied from das_client.py

Expand Down Expand Up @@ -79,6 +79,8 @@ def get_data(query, limit=None, threshold=None, idx=None, host=None, cmd=None):
if os.path.isfile(os.path.join(path, 'dasgoclient')):
cmd = "dasgoclient"
break
err, out = getstatusoutput("%s %s --query '%s'" % (cmd, cmd_opts, query))
if not err: return loads(out)
return {'status' : 'error', 'reason' : out}

p = subprocess.Popen("%s %s --query '%s'" % (cmd, cmd_opts, query),shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout, stderr = p.communicate()
if not p.returncode: return loads(stdout)
return {'status' : 'error', 'reason' : stdout}

0 comments on commit f4806ec

Please sign in to comment.