diff options
| author | spag <spag@golwen.net> | 2013-01-18 14:23:43 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-18 14:23:43 +0100 |
| commit | 5d535a508d9e84cbaf3cb8b5a21797f94b38f9ab (patch) | |
| tree | 099438f250c56a1bcac404c82a0271c14a1a98ac /misc/mon_ami | |
| parent | 6994ba4b5fecc2d532770f922d76227a175e3d71 (diff) | |
| parent | 8b37b125399ba4019091b83efe889dc8af89185f (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Conflicts:
misc/freeswitch/scripts/ini/routes.ini
Diffstat (limited to 'misc/mon_ami')
| -rw-r--r-- | misc/mon_ami/asterisk.py | 2 | ||||
| -rw-r--r-- | misc/mon_ami/freeswitch.py | 2 | ||||
| -rw-r--r-- | misc/mon_ami/helper.py | 2 | ||||
| -rw-r--r-- | misc/mon_ami/log.py | 2 | ||||
| -rwxr-xr-x | misc/mon_ami/mon_ami | 2 | ||||
| -rw-r--r-- | misc/mon_ami/mon_ami_handler.py | 2 | ||||
| -rw-r--r-- | misc/mon_ami/mon_ami_main.py | 2 | ||||
| -rw-r--r-- | misc/mon_ami/mon_ami_server.py | 2 | ||||
| -rw-r--r-- | misc/mon_ami/tcp_server.py | 2 |
9 files changed, 9 insertions, 9 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 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 |