From e1c565754b9b0aaa962ddd747acf1e12a4d46653 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 27 Feb 2015 10:24:42 +0100 Subject: Use syslog from scripts and odr-dabmod --- encode-jack-dls-jamin.sh | 2 ++ encode-jack-dls.sh | 2 ++ encode-jack.sh | 4 +++- examplesite/configuration.sh | 4 ++-- examplesite/mod.ini | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/encode-jack-dls-jamin.sh b/encode-jack-dls-jamin.sh index 459d2cb..32d4557 100644 --- a/encode-jack-dls-jamin.sh +++ b/encode-jack-dls-jamin.sh @@ -14,10 +14,12 @@ printerr() { echo -e "\033[01;31m$1\033[0m" + logger -p local0.error -t "$ID" "$1" } printmsg() { echo -e "\033[01;32m$1\033[0m" + logger -p local0.notice -t "$ID" "$1" } set -u diff --git a/encode-jack-dls.sh b/encode-jack-dls.sh index 7b8f8c9..042fc2f 100755 --- a/encode-jack-dls.sh +++ b/encode-jack-dls.sh @@ -13,10 +13,12 @@ printerr() { echo -e "\033[01;31m$1\033[0m" + logger -p local0.error -t "$ID" "$1" } printmsg() { echo -e "\033[01;32m$1\033[0m" + logger -p local0.notice -t "$ID" "$1" } set -u diff --git a/encode-jack.sh b/encode-jack.sh index f6d822d..bb28dee 100755 --- a/encode-jack.sh +++ b/encode-jack.sh @@ -11,10 +11,12 @@ printerr() { echo -e "\033[01;31m$1\033[0m" + logger -p local0.error -t "$ID" "$1" } printmsg() { echo -e "\033[01;32m$1\033[0m" + logger -p local0.notice -t "$ID" "$1" } set -u @@ -76,7 +78,7 @@ sigint_trap() { kill -KILL $encoderpid fi - printmsg "Goodbye" + printmsg "quitting" exit } diff --git a/examplesite/configuration.sh b/examplesite/configuration.sh index 0408d61..6312f21 100644 --- a/examplesite/configuration.sh +++ b/examplesite/configuration.sh @@ -10,8 +10,8 @@ declare -A radios # for each radio, write here the full encoder command. # encode-jack needs: # URL ID dabmux-URL [amplitude correction] -radios[radio1]="./encode-jack.sh http://radio1streamurl.example.com radio1 tcp://localhost:9000" +radios[radio1]="./encode-jack.sh http://fbpc5.epfl.ch:8000/fb_192 radio1 tcp://localhost:9001" # Attenuate radio2 by 3dB -radios[radio2]="./encode-jack.sh http://radio2streamurl.example.com radio2 tcp://localhost:9001 -3" +radios[radio2]="./encode-jack.sh http://91.121.151.197:8016 radio2 tcp://localhost:9002" diff --git a/examplesite/mod.ini b/examplesite/mod.ini index c3d2d37..4d20ebc 100644 --- a/examplesite/mod.ini +++ b/examplesite/mod.ini @@ -3,7 +3,7 @@ telnet=1 telnetport=2121 [log] -syslog=1 +syslog=0 filelog=1 filename=/dev/stderr @@ -34,7 +34,7 @@ device= type=b200 master_clock_rate=32768000 channel=10D -txgain=40 +txgain=50 refclk_source=internal pps_source=none behaviour_refclk_lock_lost=crash -- cgit v1.2.3