kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/syslog/syslog.c: Classify constants and macros into several

Browse source 
sub-modules. (Syslog::Priority, Syslog::Level, Syslog::Option
  and Syslog::Macros)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2012-05-21 07:18:49 +00:00
parent 28fc368955
commit 05b26a85b8
3 changed files with 99 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
Mon May 21 15:10:28 2012 Akinori MUSHA <knu@iDaemons.org> Mon May 21 15:10:28 2012 Akinori MUSHA <knu@iDaemons.org>
* ext/syslog/syslog.c: Classify constants and macros into several
sub-modules. (Syslog::Priority, Syslog::Level, Syslog::Option
and Syslog::Macros)
* ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf(). * ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().
* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a

3
NEWS
View file

@ -98,6 +98,9 @@ with all sufficient information, see the ChangeLog file.
* syslog * syslog
* Added Syslog::Logger which provides a Logger API atop Syslog. * Added Syslog::Logger which provides a Logger API atop Syslog.
* Syslog::Priority, Syslog::Level, Syslog::Option and Syslog::Macros
are introduced for easy detection of available constants on a
running system.
* lib/tmpdir.rb * lib/tmpdir.rb
* incompatible changes: * incompatible changes:

159
ext/syslog/syslog.c
View file

@ -13,7 +13,21 @@
#include <syslog.h> #include <syslog.h>
/* Syslog class */ /* Syslog class */
static VALUE mSyslog, mSyslogConstants; static VALUE mSyslog;
/*
* Module holding all Syslog constants. See Syslog::log and
* Syslog::open for constant descriptions.
*/
static VALUE mSyslogConstants;
/* Module holding Syslog option constants */
static VALUE mSyslogOption;
/* Module holding Syslog facility constants */
static VALUE mSyslogFacility;
/* Module holding Syslog level constants */
static VALUE mSyslogLevel;
/* Module holding Syslog utility macros */
static VALUE mSyslogMacros;
static const char *syslog_ident = NULL; static const char *syslog_ident = NULL;
static int syslog_options = -1, syslog_facility = -1, syslog_mask = -1; static int syslog_options = -1, syslog_facility = -1, syslog_mask = -1;
static int syslog_opened = 0; static int syslog_opened = 0;
@ -371,7 +385,7 @@ define_syslog_shortcut_method(LOG_DEBUG, debug)
* *
* Generates a mask bit for a priority level. See #mask= * Generates a mask bit for a priority level. See #mask=
*/ */
static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri) static VALUE mSyslogMacros_LOG_MASK(VALUE mod, VALUE pri)
{ {
return INT2FIX(LOG_MASK(NUM2INT(pri))); return INT2FIX(LOG_MASK(NUM2INT(pri)));
} }
@ -382,11 +396,17 @@ static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
* Generates a mask value for priority levels at or below the level specified. * Generates a mask value for priority levels at or below the level specified.
* See #mask= * See #mask=
*/ */
static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri) static VALUE mSyslogMacros_LOG_UPTO(VALUE mod, VALUE pri)
{ {
return INT2FIX(LOG_UPTO(NUM2INT(pri))); return INT2FIX(LOG_UPTO(NUM2INT(pri)));
} }
static VALUE mSyslogMacros_included(VALUE mod, VALUE target)
{
rb_extend_object(target, mSyslogMacros);
return mod;
}
/* The syslog package provides a Ruby interface to the POSIX system logging /* The syslog package provides a Ruby interface to the POSIX system logging
* facility. * facility.
* *
@ -405,14 +425,12 @@ void Init_syslog()
{ {
mSyslog = rb_define_module("Syslog"); mSyslog = rb_define_module("Syslog");
/* Document-module: Syslog::Constants mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
*
* Module holding Syslog constants. See Syslog::log and Syslog::open for
* constant descriptions.
*/
mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
rb_include_module(mSyslog, mSyslogConstants); mSyslogOption = rb_define_module_under(mSyslog, "Option");
mSyslogFacility = rb_define_module_under(mSyslog, "Facility");
mSyslogLevel = rb_define_module_under(mSyslog, "Level");
mSyslogMacros = rb_define_module_under(mSyslog, "Macros");
rb_define_module_function(mSyslog, "open", mSyslog_open, -1); rb_define_module_function(mSyslog, "open", mSyslog_open, -1);
rb_define_module_function(mSyslog, "reopen", mSyslog_reopen, -1); rb_define_module_function(mSyslog, "reopen", mSyslog_reopen, -1);
@ -428,143 +446,150 @@ void Init_syslog()
rb_define_module_function(mSyslog, "mask", mSyslog_get_mask, 0); rb_define_module_function(mSyslog, "mask", mSyslog_get_mask, 0);
rb_define_module_function(mSyslog, "mask=", mSyslog_set_mask, 1); rb_define_module_function(mSyslog, "mask=", mSyslog_set_mask, 1);
rb_define_module_function(mSyslog, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
rb_define_module_function(mSyslog, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
rb_define_module_function(mSyslog, "inspect", mSyslog_inspect, 0); rb_define_module_function(mSyslog, "inspect", mSyslog_inspect, 0);
rb_define_module_function(mSyslog, "instance", mSyslog_instance, 0); rb_define_module_function(mSyslog, "instance", mSyslog_instance, 0);
rb_define_module_function(mSyslogConstants, "LOG_MASK", mSyslogConstants_LOG_MASK, 1); /* Syslog options */
rb_define_module_function(mSyslogConstants, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
#define rb_define_syslog_const(id) \ #define rb_define_syslog_option(c) \
rb_define_const(mSyslogConstants, #id, INT2NUM(id)) rb_define_const(mSyslogOption, #c, INT2NUM(c))
/* Various options when opening log */
#ifdef LOG_PID #ifdef LOG_PID
rb_define_syslog_const(LOG_PID); rb_define_syslog_option(LOG_PID);
#endif #endif
#ifdef LOG_CONS #ifdef LOG_CONS
rb_define_syslog_const(LOG_CONS); rb_define_syslog_option(LOG_CONS);
#endif #endif
#ifdef LOG_ODELAY #ifdef LOG_ODELAY
rb_define_syslog_const(LOG_ODELAY); /* deprecated */ rb_define_syslog_option(LOG_ODELAY); /* deprecated */
#endif #endif
#ifdef LOG_NDELAY #ifdef LOG_NDELAY
rb_define_syslog_const(LOG_NDELAY); rb_define_syslog_option(LOG_NDELAY);
#endif #endif
#ifdef LOG_NOWAIT #ifdef LOG_NOWAIT
rb_define_syslog_const(LOG_NOWAIT); /* deprecated */ rb_define_syslog_option(LOG_NOWAIT); /* deprecated */
#endif #endif
#ifdef LOG_PERROR #ifdef LOG_PERROR
rb_define_syslog_const(LOG_PERROR); rb_define_syslog_option(LOG_PERROR);
#endif #endif
/* Various syslog facilities */ /* Syslog facilities */
#define rb_define_syslog_facility(c) \
rb_define_const(mSyslogFacility, #c, INT2NUM(c))
#ifdef LOG_AUTH #ifdef LOG_AUTH
rb_define_syslog_const(LOG_AUTH); rb_define_syslog_facility(LOG_AUTH);
#endif #endif
#ifdef LOG_AUTHPRIV #ifdef LOG_AUTHPRIV
rb_define_syslog_const(LOG_AUTHPRIV); rb_define_syslog_facility(LOG_AUTHPRIV);
#endif #endif
#ifdef LOG_CONSOLE #ifdef LOG_CONSOLE
rb_define_syslog_const(LOG_CONSOLE); rb_define_syslog_facility(LOG_CONSOLE);
#endif #endif
#ifdef LOG_CRON #ifdef LOG_CRON
rb_define_syslog_const(LOG_CRON); rb_define_syslog_facility(LOG_CRON);
#endif #endif
#ifdef LOG_DAEMON #ifdef LOG_DAEMON
rb_define_syslog_const(LOG_DAEMON); rb_define_syslog_facility(LOG_DAEMON);
#endif #endif
#ifdef LOG_FTP #ifdef LOG_FTP
rb_define_syslog_const(LOG_FTP); rb_define_syslog_facility(LOG_FTP);
#endif #endif
#ifdef LOG_KERN #ifdef LOG_KERN
rb_define_syslog_const(LOG_KERN); rb_define_syslog_facility(LOG_KERN);
#endif #endif
#ifdef LOG_LPR #ifdef LOG_LPR
rb_define_syslog_const(LOG_LPR); rb_define_syslog_facility(LOG_LPR);
#endif #endif
#ifdef LOG_MAIL #ifdef LOG_MAIL
rb_define_syslog_const(LOG_MAIL); rb_define_syslog_facility(LOG_MAIL);
#endif #endif
#ifdef LOG_NEWS #ifdef LOG_NEWS
rb_define_syslog_const(LOG_NEWS); rb_define_syslog_facility(LOG_NEWS);
#endif #endif
#ifdef LOG_NTP #ifdef LOG_NTP
rb_define_syslog_const(LOG_NTP); rb_define_syslog_facility(LOG_NTP);
#endif #endif
#ifdef LOG_SECURITY #ifdef LOG_SECURITY
rb_define_syslog_const(LOG_SECURITY); rb_define_syslog_facility(LOG_SECURITY);
#endif #endif
#ifdef LOG_SYSLOG #ifdef LOG_SYSLOG
rb_define_syslog_const(LOG_SYSLOG); rb_define_syslog_facility(LOG_SYSLOG);
#endif #endif
#ifdef LOG_USER #ifdef LOG_USER
rb_define_syslog_const(LOG_USER); rb_define_syslog_facility(LOG_USER);
#endif #endif
#ifdef LOG_UUCP #ifdef LOG_UUCP
rb_define_syslog_const(LOG_UUCP); rb_define_syslog_facility(LOG_UUCP);
#endif #endif
#ifdef LOG_LOCAL0 #ifdef LOG_LOCAL0
rb_define_syslog_const(LOG_LOCAL0); rb_define_syslog_facility(LOG_LOCAL0);
#endif #endif
#ifdef LOG_LOCAL1 #ifdef LOG_LOCAL1
rb_define_syslog_const(LOG_LOCAL1); rb_define_syslog_facility(LOG_LOCAL1);
#endif #endif
#ifdef LOG_LOCAL2 #ifdef LOG_LOCAL2
rb_define_syslog_const(LOG_LOCAL2); rb_define_syslog_facility(LOG_LOCAL2);
#endif #endif
#ifdef LOG_LOCAL3 #ifdef LOG_LOCAL3
rb_define_syslog_const(LOG_LOCAL3); rb_define_syslog_facility(LOG_LOCAL3);
#endif #endif
#ifdef LOG_LOCAL4 #ifdef LOG_LOCAL4
rb_define_syslog_const(LOG_LOCAL4); rb_define_syslog_facility(LOG_LOCAL4);
#endif #endif
#ifdef LOG_LOCAL5 #ifdef LOG_LOCAL5
rb_define_syslog_const(LOG_LOCAL5); rb_define_syslog_facility(LOG_LOCAL5);
#endif #endif
#ifdef LOG_LOCAL6 #ifdef LOG_LOCAL6
rb_define_syslog_const(LOG_LOCAL6); rb_define_syslog_facility(LOG_LOCAL6);
#endif #endif
#ifdef LOG_LOCAL7 #ifdef LOG_LOCAL7
rb_define_syslog_const(LOG_LOCAL7); rb_define_syslog_facility(LOG_LOCAL7);
#endif #endif
#define rb_define_syslog_shortcut(name) \ /* Syslog levels and the shortcut methods */
rb_define_module_function(mSyslog, #name, mSyslog_##name, -1)
#define rb_define_syslog_level(c, m) \
rb_define_const(mSyslogLevel, #c, INT2NUM(c)); \
rb_define_module_function(mSyslog, #m, mSyslog_##m, -1)
/* Various syslog priorities and the shortcut methods */
#ifdef LOG_EMERG #ifdef LOG_EMERG
rb_define_syslog_const(LOG_EMERG); rb_define_syslog_level(LOG_EMERG, emerg);
rb_define_syslog_shortcut(emerg);
#endif #endif
#ifdef LOG_ALERT #ifdef LOG_ALERT
rb_define_syslog_const(LOG_ALERT); rb_define_syslog_level(LOG_ALERT, alert);
rb_define_syslog_shortcut(alert);
#endif #endif
#ifdef LOG_CRIT #ifdef LOG_CRIT
rb_define_syslog_const(LOG_CRIT); rb_define_syslog_level(LOG_CRIT, crit);
rb_define_syslog_shortcut(crit);
#endif #endif
#ifdef LOG_ERR #ifdef LOG_ERR
rb_define_syslog_const(LOG_ERR); rb_define_syslog_level(LOG_ERR, err);
rb_define_syslog_shortcut(err);
#endif #endif
#ifdef LOG_WARNING #ifdef LOG_WARNING
rb_define_syslog_const(LOG_WARNING); rb_define_syslog_level(LOG_WARNING, warning);
rb_define_syslog_shortcut(warning);
#endif #endif
#ifdef LOG_NOTICE #ifdef LOG_NOTICE
rb_define_syslog_const(LOG_NOTICE); rb_define_syslog_level(LOG_NOTICE, notice);
rb_define_syslog_shortcut(notice);
#endif #endif
#ifdef LOG_INFO #ifdef LOG_INFO
rb_define_syslog_const(LOG_INFO); rb_define_syslog_level(LOG_INFO, info);
rb_define_syslog_shortcut(info);
#endif #endif
#ifdef LOG_DEBUG #ifdef LOG_DEBUG
rb_define_syslog_const(LOG_DEBUG); rb_define_syslog_level(LOG_DEBUG, debug);
rb_define_syslog_shortcut(debug);
#endif #endif
/* Syslog macros */
rb_define_method(mSyslogMacros, "LOG_MASK", mSyslogMacros_LOG_MASK, 1);
rb_define_method(mSyslogMacros, "LOG_UPTO", mSyslogMacros_LOG_UPTO, 1);
rb_define_singleton_method(mSyslogMacros, "included", mSyslogMacros_included, 1);
rb_include_module(mSyslogConstants, mSyslogOption);
rb_include_module(mSyslogConstants, mSyslogFacility);
rb_include_module(mSyslogConstants, mSyslogLevel);
rb_funcall(mSyslogConstants, rb_intern("include"), 1, mSyslogMacros);
rb_define_singleton_method(mSyslogConstants, "included", mSyslogMacros_included, 1);
rb_funcall(mSyslog, rb_intern("include"), 1, mSyslogConstants);
} }