Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 45bc95e272c3b65b412d5596709424bb75699edb
Author: Miroslav Suchý <miroslav(a)suchy.cz>
Date: Sun Dec 22 19:02:51 2013 +0100
[backend] replace procname with setproctitle
setproctitle is packaged for Fedora and works on Python3
---------------------------------------------------------------
backend/dispatcher.py | 7 ++-----
copr-be.py | 13 +++----------
copr.spec | 1 +
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/backend/dispatcher.py b/backend/dispatcher.py
index 86bbbfc..915ac81 100644
--- a/backend/dispatcher.py
+++ b/backend/dispatcher.py
@@ -16,6 +16,7 @@ from ansible import callbacks
import requests
import subprocess
import string
+import setproctitle
from IPy import IP
try:
@@ -287,11 +288,7 @@ class Worker(multiprocessing.Process):
terminate the instance
"""
- try:
- import procname
- procname.setprocname("worker")
- except ImportError:
- pass
+ setproctitle.setproctitle("worker")
while not self.kill_received:
try:
jobfile = self.jobs.get()
diff --git a/copr-be.py b/copr-be.py
index 4d3cb68..24126c1 100755
--- a/copr-be.py
+++ b/copr-be.py
@@ -17,6 +17,7 @@ import optparse
import os
import pwd
import requests
+import setproctitle
import signal
import sys
import time
@@ -76,11 +77,7 @@ class CoprJobGrab(multiprocessing.Process):
ao.run()
def run(self):
- try:
- import procname
- procname.setprocname("CoprJobGrab")
- except ImportError:
- pass
+ setproctitle.setproctitle("CoprJobGrab")
abort = False
while not abort:
self.fetch_jobs()
@@ -122,11 +119,7 @@ class CoprLog(multiprocessing.Process):
# event format is a dict {when:time, who:[worker|logger|job|main], what:str}
def run(self):
- try:
- import procname
- procname.setprocname("CoprLog")
- except ImportError:
- pass
+ setproctitle.setproctitle("CoprLog")
abort = False
while not abort:
e = self.events.get()
diff --git a/copr.spec b/copr.spec
index ab44d92..c2b94e4 100644
--- a/copr.spec
+++ b/copr.spec
@@ -58,6 +58,7 @@ Requires: python-bunch
Requires: python-daemon
Requires: python-lockfile
Requires: python-requests
+Requires: python-setproctitle
Requires: logrotate
Requires: fedmsg
Requires: gawk