Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv13100
Modified Files:
icecast.py
Log Message:
Some fixes upon Mike's request.
Index: icecast.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/icecast.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** icecast.py 24 Jun 2003 17:55:21 -0000 1.1
--- icecast.py 25 Jun 2003 23:57:48 -0000 1.2
***************
*** 15,25 ****
def __init__(self):
plugin.DaemonPlugin.__init__(self)
! self.icecast-pid = None
! self.ices-pid = None
try:
# start icecast
mycmd = os.path.basename(config.ICECAST_CMD)
! self.icecast-pid = os.spawnl(os.P_NOWAIT, config.ICECAST_CMD, mycmd,
'-d', config.ICECAST_CONF_DIR)
time.sleep(1)
# start ices
--- 15,25 ----
def __init__(self):
plugin.DaemonPlugin.__init__(self)
! self.icecast_pid = None
! self.ices_pid = None
try:
# start icecast
mycmd = os.path.basename(config.ICECAST_CMD)
! self.icecast_pid = os.spawnl(os.P_NOWAIT, config.ICECAST_CMD, mycmd,
'-d', config.ICECAST_CONF_DIR)
time.sleep(1)
# start ices
***************
*** 32,36 ****
newdir = os.path.dirname(config.ICES_DEF_LIST)
os.chdir(newdir)
! self.ices-pid = os.spawnv(os.P_NOWAIT, config.ICES_CMD, args)
os.chdir(olddir)
except:
--- 32,36 ----
newdir = os.path.dirname(config.ICES_DEF_LIST)
os.chdir(newdir)
! self.ices_pid = os.spawnv(os.P_NOWAIT, config.ICES_CMD, args)
os.chdir(olddir)
except:
***************
*** 46,51 ****
newm3ufile = file(os.path.join(config.FREEVO_CACHEDIR,
'changem3u.txt'), 'rb').read()
os.unlink(os.path.join(config.FREEVO_CACHEDIR, 'changem3u.txt'))
! os.kill(self.pid, signal.SIGTERM)
! os.waitpid(self.pid, 0)
time.sleep(1)
args = config.ICES_OPTIONS
--- 46,51 ----
newm3ufile = file(os.path.join(config.FREEVO_CACHEDIR,
'changem3u.txt'), 'rb').read()
os.unlink(os.path.join(config.FREEVO_CACHEDIR, 'changem3u.txt'))
! os.kill(self.ices_pid, signal.SIGTERM)
! os.waitpid(self.ices_pid, 0)
time.sleep(1)
args = config.ICES_OPTIONS
***************
*** 66,72 ****
# print 'icecast server::shutdown: pid=%s' % self.pid
print 'Stopping icecast server plugin.'
! os.kill(self.icecast-pid, signal.SIGTERM)
! os.waitpid(self.pid, 0)
! os.kill(self.ices-pid, signal.SIGTERM)
! os.waitpid(self.pid, 0)
--- 66,72 ----
# print 'icecast server::shutdown: pid=%s' % self.pid
print 'Stopping icecast server plugin.'
! os.kill(self.icecast_pid, signal.SIGTERM)
! os.waitpid(self.icecast_pid, 0)
! os.kill(self.ices_pid, signal.SIGTERM)
! os.waitpid(self.ices_pid, 0)
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
