Refreshed scripts. Debian version 0.4-2

debian/changelog

+qstream (0.4-2) unstable; urgency=low
+
+  * Include qstream-mpeg, drop qstream-tv. svn version r26.
+
+ -- Jon K Hellan <jon.kare.hellan@uninett.no>  Tue, 08 May 2012 13:00:23 +0200
+
 qstream (0.4-1) unstable; urgency=low
 
   * New functionality, e.g. IPv6. svn version r25.

debian/dirs

 etc
 etc/qstream
 etc/qstream/tv
+etc/qstream/mpeg
 usr/bin
 var
 var/lib
 var/lib/qstream
 var/lib/qstream/data
+var/lib/qstream/data/mpeg
 var/lib/qstream/data/sap
 var/lib/qstream/data/tv
 

debian/qstream.cron

-# qstream jobs
-
-0 * * * *     qstream /usr/bin/sap-test 3595
-*/10  * * * * qstream /usr/bin/qstream-tv.job

debian/qstream.cron.d

+# qstream jobs
+
+5,15,25,35,45,55  * * * * qstream /usr/bin/qstream-mpeg.job
+## 0 * * * *     qstream /usr/bin/sap-test 3595

debian/qstream.install

 qstream        usr/bin
-qstream-tv     usr/bin
-qstream-tv.job usr/bin
+qstream-mpeg   usr/bin
+qstream-mpeg.job usr/bin
 sap-test       usr/bin
 rtmp/client.pm usr/share/perl5/rtmp
-comvie.cf      etc/qstream/tv
-nrk.cf         etc/qstream/tv
-tv2.cf	       etc/qstream/tv
-workzone.cf    etc/qstream/tv
-world.cf       etc/qstream/tv
+comvie.cf      etc/qstream/mpeg
+tv2.cf	       etc/qstream/mpeg
+workzone.cf    etc/qstream/mpeg
+world.cf       etc/qstream/mpeg

nrk.cf

-NRK1;udp://@239.193.0.1:1234;
-NRK2;udp://@239.193.0.2:1234;
-NRK3;udp://@239.193.0.3:1234;
-Stortinget;udp://@224.67.163.13;
-

qstream-mpeg

+#!/bin/bash
+
+ulimit -c unlimited  # for debugging of hangup problem og qstream
+
+y=`date +%Y`
+m=`date +%m`
+d=`date +%d`
+h=`date +%H`
+
+
+mpeg=/var/lib/qstream/data/mpeg
+ydir=$mpeg/$y
+test -d $ydir || mkdir $ydir
+mdir=$ydir/$m
+test -d $mdir || mkdir $mdir
+ddir=$mdir/$d
+test -d $ddir || mkdir $ddir
+#hdir=$ddir/$h
+#test -d $hdir || mkdir $hdir
+
+tmpdir=$mpeg/tmp
+test -d $tmpdir || mkdir $tmpdir
+tmp=$tmpdir/qstream-$$
+
+cd $ddir
+
+export IFS=";"
+# export MALLOC_CHECK_=1   # write comprehensive error message when fail
+ulimit -c 500000000
+
+while read kanal mcaddr rest; do
+
+  echo $kanal | egrep -q '^\s*#'
+  if test $? = 1 ; then # no comment
+     log=`echo $kanal | sed -e 's/ /_/g'`
+     /usr/bin/qstream -format full -nohead -v -last 10 -nperiod 1 -net -mpeg $mcaddr > $tmp.log  2>>$log.error
+     if test $? = 0 ; then  # probably OK - keep data
+	 cat $tmp.log >> $log.log
+     else
+	 cat $tmp.log >> $tmpdir/qstream.error
+     fi
+     echo >$tmp.log
+  fi
+done
+rm $tmp.log

qstream-mpeg.job

+#!/bin/bash
+
+/usr/bin/qstream-mpeg < /etc/qstream/tv/tv2.cf
+/usr/bin/qstream-mpeg < /etc/qstream/tv/workzone.cf
+/usr/bin/qstream-mpeg < /etc/qstream/tv/world.cf

qstream-tv

 #!/bin/bash
 
+ulimit -c unlimited  # for debugging of hangup problem og qstream
+
 y=`date +%Y`
 m=`date +%m`
 d=`date +%d`
@@ -16,8 +18,9 @@ test -d $ddir || mkdir $ddir
 #hdir=$ddir/$h
 #test -d $hdir || mkdir $hdir
 
-# tmp=$tv/data/tmp/$$
-# test -d $tmp || mkdir $tmp
+tmpdir=$tv/tmp
+test -d $tmpdir || mkdir $tmpdir
+tmp=$tmpdir/qstream-$$
 
 cd $ddir
 
@@ -30,7 +33,13 @@ while read kanal mcaddr rest; do
   echo $kanal | egrep -q '^\s*#'
   if test $? = 1 ; then # no comment
      log=`echo $kanal | sed -e 's/ /_/g'`
-     /usr/bin/qstream -format full -nohead -v -last 10 -net $mcaddr >> $log.log  2>>$log.error
-
+     /usr/bin/qstream -format full -nohead -v -last 10 -net $mcaddr > $tmp.log  2>>$log.error
+     if test $? = 0 ; then  # probably OK - keep data
+	 cat $tmp.log >> $log.log
+     else
+	 cat $tmp.log >> $tmpdir/qstream.error
+     fi
+     echo >$tmp.log
   fi
 done
+rm $tmp.log

qstream-tv.job

 #!/bin/bash
 
-/usr/bin/qstream-tv < /etc/qstream/tv/nrk.cf
 /usr/bin/qstream-tv < /etc/qstream/tv/tv2.cf
 /usr/bin/qstream-tv < /etc/qstream/tv/workzone.cf
 /usr/bin/qstream-tv < /etc/qstream/tv/world.cf

world.cf

@@ -2,9 +2,7 @@ HEAnet - Dail Eireann;udp://193.1.186.20@233.4.189.33:1234;
 GRnet Channel HD MPEG-4 4Mbps;udp://@233.21.32.41:1234
 GRnet Channel SD MPEG-2 6Mbps;udp://@233.21.32.40:1234
 GRnet Channel ELLAK MPEG-4 4Mbps;udp://@233.21.32.242:1234
-# HEAnet-Multiscreen;udp://@233.4.189.35:1234;
-# Connecticut-Performance;udp://@233.88.214.142:9042
 Immersion Ocean Exploration;udp://@233.53.228.224:4424
-# RENATER-live;udp://@224.2.197.232:12346
 RedIRIS-TV;udp://@224.4.0.10:1234
-ResearchChannel;udp://@233.0.73.29:1234
+Frikanalen;udp://@233.0.224.3:1234
+TVW;udp://@233.40.190.1:5501