sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
439 discussions

git:master: core: added comments to xavps structures
by Daniel-Constantin Mierla 12 Dec '12

12 Dec '12

Module: sip-router Branch: master Commit: dccf5ede42eaf2b2f030d8c5a730418ce0517ec2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dccf5ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 12 11:08:45 2012 +0100 core: added comments to xavps structures --- xavp.h | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/xavp.h b/xavp.h index 9a31a0e..979bee4 100644 --- a/xavp.h +++ b/xavp.h @@ -32,43 +32,47 @@ struct _sr_xavp; +/* types for xavp values */ typedef enum { SR_XTYPE_NULL=0, - SR_XTYPE_INT, - SR_XTYPE_STR, - SR_XTYPE_TIME, - SR_XTYPE_LONG, - SR_XTYPE_LLONG, - SR_XTYPE_XAVP, - SR_XTYPE_DATA + SR_XTYPE_INT, /* integer value */ + SR_XTYPE_STR, /* str value */ + SR_XTYPE_TIME, /* timestamp value */ + SR_XTYPE_LONG, /* long value */ + SR_XTYPE_LLONG, /* long long value */ + SR_XTYPE_XAVP, /* xavp value */ + SR_XTYPE_DATA /* custom data value */ } sr_xtype_t; typedef void (*sr_xavp_sfree_f)(void *d); typedef void (*sr_data_free_f)(void *d, sr_xavp_sfree_f sfree); +/* structure custom data value */ typedef struct _sr_data { void *p; sr_data_free_f pfree; } sr_data_t; +/* avp value */ typedef struct _sr_xval { - sr_xtype_t type; + sr_xtype_t type; /* type of the value */ union { int i; - str s; /* replicated */ + str s; /* cloned in shared memory */ time_t t; long l; long long ll; - struct _sr_xavp *xavp; /* must be given in shm */ - sr_data_t *data; /* must be given in shm */ + struct _sr_xavp *xavp; /* must be given in shm (not cloned) */ + sr_data_t *data; /* must be given in shm (not cloned) */ } v; } sr_xval_t; +/* structure for extended avp */ typedef struct _sr_xavp { - unsigned int id; - str name; - sr_xval_t val; - struct _sr_xavp *next; + unsigned int id; /* internal hash id */ + str name; /* name of the xavp */ + sr_xval_t val; /* value of the xavp */ + struct _sr_xavp *next; /* pointer to next xavp in list */ } sr_xavp_t; int xavp_init_head(void);

2 1

Re: [sr-dev] couple of xavp questions
by jh＠tutpro.com 12 Dec '12

12 Dec '12

Olle E. Johansson writes: > In addition: Xavps are not as well documented as avps. We need to add > something. There's a wiki page with a proposal from Daniel, but I > don't know if it documents the way it turned out in the code. yes, looks like currently both xavp api doc and xavp pseudo var descriptions are missing. i just wanted to give xavps a try, because daniel suggested them. currently my sip proxy is dumping core then after transaction is finished xavps are deleted by timer process. apparently i didn't understand how the xavp rm stuff is supposed to work. -- juha

4 6

XAVP documentation start
by Olle E. Johansson 12 Dec '12

12 Dec '12

Friends, I started a section on Xavps in the pv cookbook, after the avp section. Please review and edit. http://www.kamailio.org/wiki/cookbooks/devel/pseudovariables?&#xavps Thanks, /O

2 1

git:master: modules_s/mangler: moved to common modules directory
by Daniel-Constantin Mierla 11 Dec '12

11 Dec '12

Module: sip-router Branch: master Commit: bb1894ed7b868862402a63b858f52165d5deb463 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb1894e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 11 22:39:01 2012 +0100 modules_s/mangler: moved to common modules directory --- {modules_s => modules}/mangler/Makefile | 0 {modules_s => modules}/mangler/README | 0 {modules_s => modules}/mangler/common.h | 0 {modules_s => modules}/mangler/contact_ops.c | 0 {modules_s => modules}/mangler/contact_ops.h | 0 {modules_s => modules}/mangler/doc/Makefile | 0 {modules_s => modules}/mangler/doc/functions.xml | 0 {modules_s => modules}/mangler/doc/mangler.xml | 0 {modules_s => modules}/mangler/doc/params.xml | 0 {modules_s => modules}/mangler/ip_helper.c | 0 {modules_s => modules}/mangler/ip_helper.h | 0 {modules_s => modules}/mangler/mangler.c | 0 {modules_s => modules}/mangler/mangler.cfg | 0 {modules_s => modules}/mangler/mangler.h | 0 {modules_s => modules}/mangler/sdp_mangler.c | 0 {modules_s => modules}/mangler/sdp_mangler.h | 0 {modules_s => modules}/mangler/utils.c | 0 {modules_s => modules}/mangler/utils.h | 0 18 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/mangler/Makefile b/modules/mangler/Makefile similarity index 100% rename from modules_s/mangler/Makefile rename to modules/mangler/Makefile diff --git a/modules_s/mangler/README b/modules/mangler/README similarity index 100% rename from modules_s/mangler/README rename to modules/mangler/README diff --git a/modules_s/mangler/common.h b/modules/mangler/common.h similarity index 100% rename from modules_s/mangler/common.h rename to modules/mangler/common.h diff --git a/modules_s/mangler/contact_ops.c b/modules/mangler/contact_ops.c similarity index 100% rename from modules_s/mangler/contact_ops.c rename to modules/mangler/contact_ops.c diff --git a/modules_s/mangler/contact_ops.h b/modules/mangler/contact_ops.h similarity index 100% rename from modules_s/mangler/contact_ops.h rename to modules/mangler/contact_ops.h diff --git a/modules_s/mangler/doc/Makefile b/modules/mangler/doc/Makefile similarity index 100% rename from modules_s/mangler/doc/Makefile rename to modules/mangler/doc/Makefile diff --git a/modules_s/mangler/doc/functions.xml b/modules/mangler/doc/functions.xml similarity index 100% rename from modules_s/mangler/doc/functions.xml rename to modules/mangler/doc/functions.xml diff --git a/modules_s/mangler/doc/mangler.xml b/modules/mangler/doc/mangler.xml similarity index 100% rename from modules_s/mangler/doc/mangler.xml rename to modules/mangler/doc/mangler.xml diff --git a/modules_s/mangler/doc/params.xml b/modules/mangler/doc/params.xml similarity index 100% rename from modules_s/mangler/doc/params.xml rename to modules/mangler/doc/params.xml diff --git a/modules_s/mangler/ip_helper.c b/modules/mangler/ip_helper.c similarity index 100% rename from modules_s/mangler/ip_helper.c rename to modules/mangler/ip_helper.c diff --git a/modules_s/mangler/ip_helper.h b/modules/mangler/ip_helper.h similarity index 100% rename from modules_s/mangler/ip_helper.h rename to modules/mangler/ip_helper.h diff --git a/modules_s/mangler/mangler.c b/modules/mangler/mangler.c similarity index 100% rename from modules_s/mangler/mangler.c rename to modules/mangler/mangler.c diff --git a/modules_s/mangler/mangler.cfg b/modules/mangler/mangler.cfg similarity index 100% rename from modules_s/mangler/mangler.cfg rename to modules/mangler/mangler.cfg diff --git a/modules_s/mangler/mangler.h b/modules/mangler/mangler.h similarity index 100% rename from modules_s/mangler/mangler.h rename to modules/mangler/mangler.h diff --git a/modules_s/mangler/sdp_mangler.c b/modules/mangler/sdp_mangler.c similarity index 100% rename from modules_s/mangler/sdp_mangler.c rename to modules/mangler/sdp_mangler.c diff --git a/modules_s/mangler/sdp_mangler.h b/modules/mangler/sdp_mangler.h similarity index 100% rename from modules_s/mangler/sdp_mangler.h rename to modules/mangler/sdp_mangler.h diff --git a/modules_s/mangler/utils.c b/modules/mangler/utils.c similarity index 100% rename from modules_s/mangler/utils.c rename to modules/mangler/utils.c diff --git a/modules_s/mangler/utils.h b/modules/mangler/utils.h similarity index 100% rename from modules_s/mangler/utils.h rename to modules/mangler/utils.h

1 0

git:master: modules_s/eval: unused module moved to obsolete directory
by Daniel-Constantin Mierla 11 Dec '12

11 Dec '12

Module: sip-router Branch: master Commit: a4b0267cd57255a2f5c24bf466181e592841b6f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4b0267… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 11 22:36:14 2012 +0100 modules_s/eval: unused module moved to obsolete directory - use core config expressions --- {modules_s => obsolete}/eval/Makefile | 0 {modules_s => obsolete}/eval/README | 0 {modules_s => obsolete}/eval/eval.c | 0 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/eval/Makefile b/obsolete/eval/Makefile similarity index 100% rename from modules_s/eval/Makefile rename to obsolete/eval/Makefile diff --git a/modules_s/eval/README b/obsolete/eval/README similarity index 100% rename from modules_s/eval/README rename to obsolete/eval/README diff --git a/modules_s/eval/eval.c b/obsolete/eval/eval.c similarity index 100% rename from modules_s/eval/eval.c rename to obsolete/eval/eval.c

1 0

git:master: modules_s/options: moved to obsolete/ folder
by Elena-Ramona Modroiu 11 Dec '12

11 Dec '12

Module: sip-router Branch: master Commit: 5028c86d306a3f9ccec6e46d1fcf5f6a03f1d6ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5028c86… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 11 22:17:14 2012 +0100 modules_s/options: moved to obsolete/ folder --- {modules_s => obsolete}/options/Makefile | 0 {modules_s => obsolete}/options/README | 0 {modules_s => obsolete}/options/doc/Makefile | 0 {modules_s => obsolete}/options/doc/functions.xml | 0 {modules_s => obsolete}/options/doc/options.xml | 0 {modules_s => obsolete}/options/doc/params.xml | 0 {modules_s => obsolete}/options/mod_options.c | 0 {modules_s => obsolete}/options/mod_options.h | 0 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/options/Makefile b/obsolete/options/Makefile similarity index 100% rename from modules_s/options/Makefile rename to obsolete/options/Makefile diff --git a/modules_s/options/README b/obsolete/options/README similarity index 100% rename from modules_s/options/README rename to obsolete/options/README diff --git a/modules_s/options/doc/Makefile b/obsolete/options/doc/Makefile similarity index 100% rename from modules_s/options/doc/Makefile rename to obsolete/options/doc/Makefile diff --git a/modules_s/options/doc/functions.xml b/obsolete/options/doc/functions.xml similarity index 100% rename from modules_s/options/doc/functions.xml rename to obsolete/options/doc/functions.xml diff --git a/modules_s/options/doc/options.xml b/obsolete/options/doc/options.xml similarity index 100% rename from modules_s/options/doc/options.xml rename to obsolete/options/doc/options.xml diff --git a/modules_s/options/doc/params.xml b/obsolete/options/doc/params.xml similarity index 100% rename from modules_s/options/doc/params.xml rename to obsolete/options/doc/params.xml diff --git a/modules_s/options/mod_options.c b/obsolete/options/mod_options.c similarity index 100% rename from modules_s/options/mod_options.c rename to obsolete/options/mod_options.c diff --git a/modules_s/options/mod_options.h b/obsolete/options/mod_options.h similarity index 100% rename from modules_s/options/mod_options.h rename to obsolete/options/mod_options.h

1 0

git:master: modules_s/speeddial: moved to obsolete/ folder
by Elena-Ramona Modroiu 11 Dec '12

11 Dec '12

Module: sip-router Branch: master Commit: 47a9b7cf8b0d9f178f8905afc9434f0cd2d8f2f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47a9b7c… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 11 21:44:45 2012 +0100 modules_s/speeddial: moved to obsolete/ folder --- {modules_s => obsolete}/speeddial/Makefile | 0 {modules_s => obsolete}/speeddial/README | 0 {modules_s => obsolete}/speeddial/doc/Makefile | 0 {modules_s => obsolete}/speeddial/doc/faq.xml | 0 .../speeddial/doc/functions.xml | 0 {modules_s => obsolete}/speeddial/doc/params.xml | 0 .../speeddial/doc/speeddial.cfg | 0 .../speeddial/doc/speeddial.sql | 0 .../speeddial/doc/speeddial.xml | 0 {modules_s => obsolete}/speeddial/sdlookup.c | 0 {modules_s => obsolete}/speeddial/sdlookup.h | 0 {modules_s => obsolete}/speeddial/speeddial.c | 0 {modules_s => obsolete}/speeddial/speeddial.h | 0 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/speeddial/Makefile b/obsolete/speeddial/Makefile similarity index 100% rename from modules_s/speeddial/Makefile rename to obsolete/speeddial/Makefile diff --git a/modules_s/speeddial/README b/obsolete/speeddial/README similarity index 100% rename from modules_s/speeddial/README rename to obsolete/speeddial/README diff --git a/modules_s/speeddial/doc/Makefile b/obsolete/speeddial/doc/Makefile similarity index 100% rename from modules_s/speeddial/doc/Makefile rename to obsolete/speeddial/doc/Makefile diff --git a/modules_s/speeddial/doc/faq.xml b/obsolete/speeddial/doc/faq.xml similarity index 100% rename from modules_s/speeddial/doc/faq.xml rename to obsolete/speeddial/doc/faq.xml diff --git a/modules_s/speeddial/doc/functions.xml b/obsolete/speeddial/doc/functions.xml similarity index 100% rename from modules_s/speeddial/doc/functions.xml rename to obsolete/speeddial/doc/functions.xml diff --git a/modules_s/speeddial/doc/params.xml b/obsolete/speeddial/doc/params.xml similarity index 100% rename from modules_s/speeddial/doc/params.xml rename to obsolete/speeddial/doc/params.xml diff --git a/modules_s/speeddial/doc/speeddial.cfg b/obsolete/speeddial/doc/speeddial.cfg similarity index 100% rename from modules_s/speeddial/doc/speeddial.cfg rename to obsolete/speeddial/doc/speeddial.cfg diff --git a/modules_s/speeddial/doc/speeddial.sql b/obsolete/speeddial/doc/speeddial.sql similarity index 100% rename from modules_s/speeddial/doc/speeddial.sql rename to obsolete/speeddial/doc/speeddial.sql diff --git a/modules_s/speeddial/doc/speeddial.xml b/obsolete/speeddial/doc/speeddial.xml similarity index 100% rename from modules_s/speeddial/doc/speeddial.xml rename to obsolete/speeddial/doc/speeddial.xml diff --git a/modules_s/speeddial/sdlookup.c b/obsolete/speeddial/sdlookup.c similarity index 100% rename from modules_s/speeddial/sdlookup.c rename to obsolete/speeddial/sdlookup.c diff --git a/modules_s/speeddial/sdlookup.h b/obsolete/speeddial/sdlookup.h similarity index 100% rename from modules_s/speeddial/sdlookup.h rename to obsolete/speeddial/sdlookup.h diff --git a/modules_s/speeddial/speeddial.c b/obsolete/speeddial/speeddial.c similarity index 100% rename from modules_s/speeddial/speeddial.c rename to obsolete/speeddial/speeddial.c diff --git a/modules_s/speeddial/speeddial.h b/obsolete/speeddial/speeddial.h similarity index 100% rename from modules_s/speeddial/speeddial.h rename to obsolete/speeddial/speeddial.h

1 0

git:master: modules_s/uac: moved to obsolete/ folder
by Elena-Ramona Modroiu 11 Dec '12

11 Dec '12

Module: sip-router Branch: master Commit: fc486d312ea11b6ff26c091e8649d9fe2228f931 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc486d3… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 11 21:30:41 2012 +0100 modules_s/uac: moved to obsolete/ folder --- {modules_s => obsolete}/uac/Makefile | 0 {modules_s => obsolete}/uac/README | 0 {modules_s => obsolete}/uac/auth.c | 0 {modules_s => obsolete}/uac/auth.h | 0 {modules_s => obsolete}/uac/auth_alg.c | 0 {modules_s => obsolete}/uac/auth_alg.h | 0 {modules_s => obsolete}/uac/auth_hdr.c | 0 {modules_s => obsolete}/uac/auth_hdr.h | 0 {modules_s => obsolete}/uac/doc/Makefile | 0 {modules_s => obsolete}/uac/doc/functions.xml | 0 {modules_s => obsolete}/uac/doc/params.xml | 0 {modules_s => obsolete}/uac/doc/replace_from.patch | 0 {modules_s => obsolete}/uac/doc/uac.xml | 0 {modules_s => obsolete}/uac/from.c | 0 {modules_s => obsolete}/uac/from.h | 0 {modules_s => obsolete}/uac/uac.c | 0 16 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/uac/Makefile b/obsolete/uac/Makefile similarity index 100% rename from modules_s/uac/Makefile rename to obsolete/uac/Makefile diff --git a/modules_s/uac/README b/obsolete/uac/README similarity index 100% rename from modules_s/uac/README rename to obsolete/uac/README diff --git a/modules_s/uac/auth.c b/obsolete/uac/auth.c similarity index 100% rename from modules_s/uac/auth.c rename to obsolete/uac/auth.c diff --git a/modules_s/uac/auth.h b/obsolete/uac/auth.h similarity index 100% rename from modules_s/uac/auth.h rename to obsolete/uac/auth.h diff --git a/modules_s/uac/auth_alg.c b/obsolete/uac/auth_alg.c similarity index 100% rename from modules_s/uac/auth_alg.c rename to obsolete/uac/auth_alg.c diff --git a/modules_s/uac/auth_alg.h b/obsolete/uac/auth_alg.h similarity index 100% rename from modules_s/uac/auth_alg.h rename to obsolete/uac/auth_alg.h diff --git a/modules_s/uac/auth_hdr.c b/obsolete/uac/auth_hdr.c similarity index 100% rename from modules_s/uac/auth_hdr.c rename to obsolete/uac/auth_hdr.c diff --git a/modules_s/uac/auth_hdr.h b/obsolete/uac/auth_hdr.h similarity index 100% rename from modules_s/uac/auth_hdr.h rename to obsolete/uac/auth_hdr.h diff --git a/modules_s/uac/doc/Makefile b/obsolete/uac/doc/Makefile similarity index 100% rename from modules_s/uac/doc/Makefile rename to obsolete/uac/doc/Makefile diff --git a/modules_s/uac/doc/functions.xml b/obsolete/uac/doc/functions.xml similarity index 100% rename from modules_s/uac/doc/functions.xml rename to obsolete/uac/doc/functions.xml diff --git a/modules_s/uac/doc/params.xml b/obsolete/uac/doc/params.xml similarity index 100% rename from modules_s/uac/doc/params.xml rename to obsolete/uac/doc/params.xml diff --git a/modules_s/uac/doc/replace_from.patch b/obsolete/uac/doc/replace_from.patch similarity index 100% rename from modules_s/uac/doc/replace_from.patch rename to obsolete/uac/doc/replace_from.patch diff --git a/modules_s/uac/doc/uac.xml b/obsolete/uac/doc/uac.xml similarity index 100% rename from modules_s/uac/doc/uac.xml rename to obsolete/uac/doc/uac.xml diff --git a/modules_s/uac/from.c b/obsolete/uac/from.c similarity index 100% rename from modules_s/uac/from.c rename to obsolete/uac/from.c diff --git a/modules_s/uac/from.h b/obsolete/uac/from.h similarity index 100% rename from modules_s/uac/from.h rename to obsolete/uac/from.h diff --git a/modules_s/uac/uac.c b/obsolete/uac/uac.c similarity index 100% rename from modules_s/uac/uac.c rename to obsolete/uac/uac.c

1 0

git:master: app_python: Moved all python scripts to 'python_examples' folder.
by Konstantin Mosesov 11 Dec '12

11 Dec '12

Module: sip-router Branch: master Commit: 230919ad2e414f0c070a710cb85b3b2b3dfea741 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=230919a… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Tue Dec 11 14:24:08 2012 +0200 app_python: Moved all python scripts to 'python_examples' folder. app_python: Applied a few recent patches for better stack trace. app_python: Fixed a possible segfault on double free. app_python: Added python abstraction layers Router.Core, Router.Ranks, Router.Logger. app_python: Moved all logging stuff to layer Router.Logger, e.g., Router.Logger.LM_ERR(...). app_python: Added 'ranks' constants and moved to Router.Ranks, e.g., Router.Ranks.PROC_MAIN. --- modules/app_python/mod_Core.c | 70 ++++++ modules/app_python/mod_Core.h | 38 +++ modules/app_python/mod_Logger.c | 249 ++++++++++++++++++++ modules/app_python/mod_Logger.h | 39 +++ modules/app_python/mod_Ranks.c | 85 +++++++ modules/app_python/mod_Ranks.h | 38 +++ modules/app_python/mod_Router.c | 72 ++++++ modules/app_python/mod_Router.h | 39 +++ .../app_python/{ => python_examples}/Loggers.py | 0 .../{ => python_examples}/TestCase_Traceback.py | 0 .../app_python/{ => python_examples}/handler.py | 0 modules/app_python/python_iface.c | 205 ++--------------- modules/app_python/python_iface.h | 2 +- modules/app_python/python_mod.c | 212 ++++++++++++----- modules/app_python/python_msgobj.c | 124 ++++------- modules/app_python/python_support.c | 182 +++++++++++++-- modules/app_python/python_support.h | 12 +- 17 files changed, 1028 insertions(+), 339 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=230…

2 1

git:master: mod_python: Changed Loggers.py to use recent changes ( python abstraction layers).
by Konstantin Mosesov 11 Dec '12

11 Dec '12

Module: sip-router Branch: master Commit: cc9b6cad1130891c54b94b44bebb2b6cdf397b1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc9b6ca… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Tue Dec 11 16:29:30 2012 +0200 mod_python: Changed Loggers.py to use recent changes (python abstraction layers). --- modules/app_python/python_examples/Loggers.py | 70 ++++++++++++++++++++----- 1 files changed, 56 insertions(+), 14 deletions(-) diff --git a/modules/app_python/python_examples/Loggers.py b/modules/app_python/python_examples/Loggers.py index 9f8b706..8ae2ed0 100644 --- a/modules/app_python/python_examples/Loggers.py +++ b/modules/app_python/python_examples/Loggers.py @@ -2,13 +2,16 @@ """ Script for logging test. - 2012.12.03: Created by: Konstantin M. <evilzluk(a)gmail.com> + Added: 2012-12-03: Created by: Konstantin M. <evilzluk(a)gmail.com> + Changed: 2012-12-11: Changed code to use Router.Logger + Changed: 2012-12-11: Changed code to use Router.Ranks """ -import Router +import Router.Logger as Logger +import Router.Ranks as Ranks """ - Module Properties: + Router.Logger Module Properties: Log Levels: L_ALERT L_BUG @@ -23,7 +26,7 @@ import Router Log Facilities: DEFAULT_FACILITY - Module Methods: + Router.Logger Module Methods: LM_GEN1(self, int log_level, str msg) LM_GEN2(self, int log_facility, int log_level, str msg) LM_ALERT(self, str msg) @@ -35,6 +38,20 @@ import Router LM_DBG(self, str msg) + Router.Ranks Module Properties: + PROC_MAIN + PROC_TIMER + PROC_RPC + PROC_FIFO + PROC_TCP_MAIN + PROC_UNIXSOCK + PROC_ATTENDANT + PROC_INIT + PROC_NOCHLDINIT + PROC_SIPINIT + PROC_SIPRPC + PROC_MIN + """ class Loggers: @@ -45,19 +62,44 @@ class Loggers: def __del__(self): pass - def child_init(self, y): + def child_init(self, rank): + if rank == Ranks.PROC_MAIN: + Logger.LM_ERR("rank is PROC_MAIN") + elif rank == Ranks.PROC_TIMER: + Logger.LM_ERR("rank is PROC_TIMER") + elif rank == Ranks.PROC_RPC: + Logger.LM_ERR("rank is PROC_RPC") + elif rank == Ranks.PROC_FIFO: + Logger.LM_ERR("rank is PROC_FIFO") + elif rank == Ranks.PROC_TCP_MAIN: + Logger.LM_ERR("rank is PROC_TCP_MAIN") + elif rank == Ranks.PROC_UNIXSOCK: + Logger.LM_ERR("rank is PROC_UNIXSOCK") + elif rank == Ranks.PROC_ATTENDANT: + Logger.LM_ERR("rank is PROC_ATTENDANT") + elif rank == Ranks.PROC_INIT: + Logger.LM_ERR("rank is PROC_INIT") + elif rank == Ranks.PROC_NOCHLDINIT: + Logger.LM_ERR("rank is PROC_NOCHLDINIT") + elif rank == Ranks.PROC_SIPINIT: + Logger.LM_ERR("rank is PROC_SIPINIT") + elif rank == Ranks.PROC_SIPRPC: + Logger.LM_ERR("rank is PROC_SIPRPC") + elif rank == Ranks.PROC_MIN: + Logger.LM_ERR("rank is PROC_MIN") + return 0 def TestLoggers(self, msg, args): - Router.LM_GEN1(Router.L_INFO, "Loggers.py: LM_GEN1: msg: %s" % str(args)) - Router.LM_GEN2(Router.L_INFO, Router.DEFAULT_FACILITY, "Loggers.py: LM_GEN2: msg: %s" % str(args)) - Router.LM_ALERT( "Loggers.py: LM_ALERT: msg: %s" % str(args)) - Router.LM_CRIT( "Loggers.py: LM_CRIT: msg: %s" % str(args)) - Router.LM_ERR( "Loggers.py: LM_ERR: msg: %s" % str(args)) - Router.LM_WARN( "Loggers.py: LM_WARN: msg: %s" % str(args)) - Router.LM_NOTICE( "Loggers.py: LM_NOTICE: msg: %s" % str(args)) - Router.LM_INFO( "Loggers.py: LM_INFO: msg: %s" % str(args)) - Router.LM_DBG( "Loggers.py: LM_DBG: msg: %s" % str(args)) + Logger.LM_GEN1(Logger.L_INFO, "Loggers.py: LM_GEN1: msg: %s" % str(args)) + Logger.LM_GEN2(Logger.L_INFO, Logger.DEFAULT_FACILITY, "Loggers.py: LM_GEN2: msg: %s" % str(args)) + Logger.LM_ALERT( "Loggers.py: LM_ALERT: msg: %s" % str(args)) + Logger.LM_CRIT( "Loggers.py: LM_CRIT: msg: %s" % str(args)) + Logger.LM_ERR( "Loggers.py: LM_ERR: msg: %s" % str(args)) + Logger.LM_WARN( "Loggers.py: LM_WARN: msg: %s" % str(args)) + Logger.LM_NOTICE( "Loggers.py: LM_NOTICE: msg: %s" % str(args)) + Logger.LM_INFO( "Loggers.py: LM_INFO: msg: %s" % str(args)) + Logger.LM_DBG( "Loggers.py: LM_DBG: msg: %s" % str(args)) return 1 def mod_init():

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012