Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

This commit is contained in:
Martin Konecny 2013-03-07 18:34:10 -05:00
commit 3969e38d51
2 changed files with 2 additions and 2 deletions

2
debian/control vendored
View file

@ -41,7 +41,7 @@ Depends: apache2,
pwgen, pwgen,
python, python,
rabbitmq-server, rabbitmq-server,
silan, silan (>= 0.3.0~),
sudo, sudo,
sysv-rc, sysv-rc,
tar (>= 1.22), tar (>= 1.22),

View file

@ -42,7 +42,7 @@ class SilanAnalyzer(Thread):
full_path = f['fp'] full_path = f['fp']
# silence detect(set default queue in and out) # silence detect(set default queue in and out)
try: try:
command = ['silan', '-b', '-f', 'JSON', full_path] command = ['nice', '-n', '19', 'silan', '-b', '-f', 'JSON', full_path]
proc = subprocess.Popen(command, stdout=subprocess.PIPE) proc = subprocess.Popen(command, stdout=subprocess.PIPE)
out = proc.communicate()[0].strip('\r\n') out = proc.communicate()[0].strip('\r\n')
info = json.loads(out) info = json.loads(out)