Merge branch 'develop'5.1-beta1

10 files changed, 9 insertions, 67 deletions

diff --git a/misc/mon_ami/asterisk.py b/misc/mon_ami/asterisk.py
index ffcff06..3406c5b 100644
--- a/misc/mon_ami/asterisk.py
+++ b/misc/mon_ami/asterisk.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface Server
 # Asterisk AMI client connector
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 from threading import Thread, Lock
 from log import ldebug, linfo, lwarn, lerror, lcritic
diff --git a/misc/mon_ami/freeswitch.py b/misc/mon_ami/freeswitch.py
index eab9bb6..218b7db 100644
--- a/misc/mon_ami/freeswitch.py
+++ b/misc/mon_ami/freeswitch.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface server
 # FreeSWITCH event socket interface
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 from threading import Thread, Lock
 from log import ldebug, linfo, lwarn, lerror, lcritic
diff --git a/misc/mon_ami/helper.py b/misc/mon_ami/helper.py
index bf286de..8e665a4 100644
--- a/misc/mon_ami/helper.py
+++ b/misc/mon_ami/helper.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface server
 # helper functions
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 
 def to_hash(message):
diff --git a/misc/mon_ami/log.py b/misc/mon_ami/log.py
index 92709ad..e89a53f 100644
--- a/misc/mon_ami/log.py
+++ b/misc/mon_ami/log.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Log library
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 import logging
 
diff --git a/misc/mon_ami/mon-ami b/misc/mon_ami/mon-ami
deleted file mode 100755
index a630140..0000000
--- a/misc/mon_ami/mon-ami
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-#####################################################################
-# MonAMI Asterisk Manger Interface Emulator
-# Start Script
-# (c) AMOOMA GmbH 2012
-#####################################################################
-
-### BEGIN INIT INFO
-# Provides:          mon_ami 
-# Required-Start:    freeswitch 
-# Required-Stop:     freeswitch
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: MonAMI Asterisk Manger Interface Emulator
-# Description:
-#
-### END INIT INFO
-
-DAEMON=/opt/GS5/misc/mon_ami/mon_ami
-EXECUTABLE=`basename 'mon_ami'`
-DESC="MonAMI Asterisk Manger Interface Emulator"
-ARGS="--log-file=/var/log/mon_ami.log"
-
-if ! [ -x $DAEMON ] ; then
-	echo "ERROR: $DAEMON not found"
-	exit 1
-fi
-
-case "$1" in
-	start)
-	        echo -n "Starting $DESC: "
-	        start-stop-daemon --start --pidfile /var/run/$EXECUTABLE.pid \
-            	--make-pidfile --background --startas $DAEMON -- $ARGS
-		echo "$EXECUTABLE."
-		;;
-
-	stop)
-		echo -n "Stopping $DESC: "
-		start-stop-daemon --stop --quiet --oknodo --retry=TERM/30/KILL/5 \
-		--pidfile /var/run/$EXECUTABLE.pid
-		rm -f /var/run/$NAME.pid
-		echo "$EXECUTABLE."
-		;;
-
-	reload|restart|force-reload)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
-		exit 1
-		;;
-esac
-
-exit 0
diff --git a/misc/mon_ami/mon_ami b/misc/mon_ami/mon_ami
index a212cfe..0e8ce50 100755
--- a/misc/mon_ami/mon_ami
+++ b/misc/mon_ami/mon_ami
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface Server
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 from mon_ami_main import main
 from sys import exit
 
diff --git a/misc/mon_ami/mon_ami_handler.py b/misc/mon_ami/mon_ami_handler.py
index 59e9225..015f547 100644
--- a/misc/mon_ami/mon_ami_handler.py
+++ b/misc/mon_ami/mon_ami_handler.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface Server
 # Asterisk AMI Emulator Handler Process
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 from threading import Thread
 from log import ldebug, linfo, lwarn, lerror, lcritic
diff --git a/misc/mon_ami/mon_ami_main.py b/misc/mon_ami/mon_ami_main.py
index 13dd4bb..72220e5 100644
--- a/misc/mon_ami/mon_ami_main.py
+++ b/misc/mon_ami/mon_ami_main.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface Server
 # Main Programm
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 from log import ldebug, linfo, lwarn, lerror, lcritic, setup_log
 from time import sleep
diff --git a/misc/mon_ami/mon_ami_server.py b/misc/mon_ami/mon_ami_server.py
index 68e72c8..d3d7c0f 100644
--- a/misc/mon_ami/mon_ami_server.py
+++ b/misc/mon_ami/mon_ami_server.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface Server
 # Asterisk AMI Emulator server thread
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 from threading import Thread
 from log import ldebug, linfo, lwarn, lerror, lcritic
diff --git a/misc/mon_ami/tcp_server.py b/misc/mon_ami/tcp_server.py
index 5536282..5faa9ea 100644
--- a/misc/mon_ami/tcp_server.py
+++ b/misc/mon_ami/tcp_server.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # MonAMI Asterisk Manger Interface Server
 # TCP Server
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
 
 import socket
 from traceback import format_exc