Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more structural organization of files/packages

Browse source
This commit is contained in:
Martin Konecny 2013-05-16 13:41:56 -04:00
parent 1c87d51b8e
commit 888e6db812
12 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/pypo/airtime-playout
View file

@ -9,7 +9,7 @@ SCRIPT=`readlink -f $0`
pypo_path=`dirname $SCRIPT` pypo_path=`dirname $SCRIPT`
api_client_path="/usr/lib/airtime/" api_client_path="/usr/lib/airtime/"
pypo_script="pypocli.py" pypo_script="pypo.py"
cd ${pypo_path} cd ${pypo_path}
set +e set +e

0
python_apps/pypo/logging.cfg → python_apps/pypo/configs/logging.cfg
View file

0
python_apps/pypo/notify_logging.cfg → python_apps/pypo/configs/notify_logging.cfg
View file

1
python_apps/pypo/liquidsoap_bin

@ -1 +0,0 @@
Subproject commit 492242f4bb7367afebbf2f096067cb5a5d3c0449

2
python_apps/pypo/liquidsoap_scripts/notify.sh
View file

@ -10,5 +10,5 @@ SCRIPT=`readlink -f $0`
# Absolute path this script is in # Absolute path this script is in
SCRIPTPATH=`dirname $SCRIPT` SCRIPTPATH=`dirname $SCRIPT`
cd ${SCRIPTPATH}/../ cd ${SCRIPTPATH}
timeout 45 python pyponotify.py "$@" timeout 45 python pyponotify.py "$@"

2
python_apps/pypo/pyponotify.py → python_apps/pypo/liquidsoap_scripts/pyponotify.py
View file

@ -50,7 +50,7 @@ parser.add_option("-n", "--liquidsoap-started", help="notify liquidsoap started"
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
# configure logging # configure logging
logging.config.fileConfig("notify_logging.cfg") logging.config.fileConfig("configs/notify_logging.cfg")
logger = logging.getLogger('notify') logger = logging.getLogger('notify')
LogWriter.override_std_err(logger) LogWriter.override_std_err(logger)

4
python_apps/pypo/pypocli.py → python_apps/pypo/pypo.py
View file

@ -21,6 +21,7 @@ from threading import Lock
from schedule.pypopush import PypoPush from schedule.pypopush import PypoPush
from schedule.pypofetch import PypoFetch from schedule.pypofetch import PypoFetch
from schedule.pypofile import PypoFile from schedule.pypofile import PypoFile
from schedule import pure
from recorder.recorder import Recorder from recorder.recorder import Recorder
from schedule.listenerstat import ListenerStat from schedule.listenerstat import ListenerStat
from pypomessagehandler import PypoMessageHandler from pypomessagehandler import PypoMessageHandler
@ -34,7 +35,6 @@ from configobj import ConfigObj
# custom imports # custom imports
from api_clients import api_client from api_clients import api_client
from std_err_override import LogWriter from std_err_override import LogWriter
import pure
# Set up command-line options # Set up command-line options
parser = OptionParser() parser = OptionParser()
@ -81,7 +81,7 @@ LIQUIDSOAP_MIN_VERSION = "1.1.1"
# configure logging # configure logging
try: try:
logging.config.fileConfig("logging.cfg") logging.config.fileConfig("configs/logging.cfg")
logger = logging.getLogger() logger = logging.getLogger()
LogWriter.override_std_err(logger) LogWriter.override_std_err(logger)
except Exception, e: except Exception, e:

2
python_apps/pypo/pypomessagehandler.py
View file

@ -15,7 +15,7 @@ import json
from std_err_override import LogWriter from std_err_override import LogWriter
# configure logging # configure logging
logging.config.fileConfig("logging.cfg") logging.config.fileConfig("configs/logging.cfg")
logger = logging.getLogger('message_h') logger = logging.getLogger('message_h')
LogWriter.override_std_err(logger) LogWriter.override_std_err(logger)

0
python_apps/pypo/pure.py → python_apps/pypo/schedule/pure.py
View file

4
python_apps/pypo/schedule/pypofetch.py
View file

@ -11,7 +11,7 @@ import subprocess
import signal import signal
from datetime import datetime from datetime import datetime
import traceback import traceback
import pure from schedule import pure
from Queue import Empty from Queue import Empty
from threading import Thread from threading import Thread
@ -22,7 +22,7 @@ from std_err_override import LogWriter
# configure logging # configure logging
logging_cfg = os.path.join(os.path.dirname(__file__), "../logging.cfg") logging_cfg = os.path.join(os.path.dirname(__file__), "../configs/logging.cfg")
logging.config.fileConfig(logging_cfg) logging.config.fileConfig(logging_cfg)
logger = logging.getLogger() logger = logging.getLogger()
LogWriter.override_std_err(logger) LogWriter.override_std_err(logger)

2
python_apps/pypo/schedule/pypofile.py
View file

@ -12,7 +12,7 @@ import stat
from std_err_override import LogWriter from std_err_override import LogWriter
# configure logging # configure logging
logging_cfg = os.path.join(os.path.dirname(__file__), "../logging.cfg") logging_cfg = os.path.join(os.path.dirname(__file__), "../configs/logging.cfg")
logging.config.fileConfig(logging_cfg) logging.config.fileConfig(logging_cfg)
logger = logging.getLogger() logger = logging.getLogger()
LogWriter.override_std_err(logger) LogWriter.override_std_err(logger)

2
python_apps/pypo/schedule/pypopush.py
View file

@ -25,7 +25,7 @@ from configobj import ConfigObj
# configure logging # configure logging
logging_cfg = os.path.join(os.path.dirname(__file__), "../logging.cfg") logging_cfg = os.path.join(os.path.dirname(__file__), "../configs/logging.cfg")
logging.config.fileConfig(logging_cfg) logging.config.fileConfig(logging_cfg)
logger = logging.getLogger() logger = logging.getLogger()
LogWriter.override_std_err(logger) LogWriter.override_std_err(logger)