Unified Diff: sitescripts/logs/bin/mergeSubscriptionStats.py
Issue 10942098:
Make sure subprocess calls don`t ignore result codes indicating errors. Fix JS docs generation whil… (Closed)
Patch Set: Fixed wrong argument format
Created July 4, 2013, 1:01 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« sitescripts/extensions/bin/updateDownloadLinks.py ('K')
|
« sitescripts/extensions/bin/updateRecommendations.py ('k')
|
sitescripts/management/bin/generateHgAuth.py » ('j')
|
sitescripts/subscriptions/bin/updateSubscriptionDownloads.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: sitescripts/logs/bin/mergeSubscriptionStats.py |
| =================================================================== |
| --- a/sitescripts/logs/bin/mergeSubscriptionStats.py |
| +++ b/sitescripts/logs/bin/mergeSubscriptionStats.py |
| @@ -22,17 +22,17 @@ from StringIO import StringIO |
| def readStatsFile(path): |
| result = SafeConfigParser() |
| match = re.search(r'^ssh://(\w+)@([^/:]+)(?::(\d+))?', path) |
| if match: |
| command = ['ssh', '-q', '-o' 'NumberOfPasswordPrompts 0', '-T', '-k', '-l', match.group(1), match.group(2)] |
| if match.group(3): |
| command[1:1] = ['-P', match.group(3)] |
| - (data, dummy) = subprocess.Popen(command, stdout=subprocess.PIPE).communicate() |
| + data = subprocess.check_output(command) |
| result.readfp(StringIO(data)) |
| elif path.startswith('http://') or path.startswith('https://'): |
| result.readfp(urllib.urlopen(path)) |
| elif os.path.exists(path): |
| result.read(path) |
| return result |
| def getStatsFiles(): |
