Kouhei Sutou
null+****@clear*****
Sun Jul 26 19:37:31 JST 2015
Kouhei Sutou 2015-07-26 19:37:31 +0900 (Sun, 26 Jul 2015) New Revision: a6f9094b4d48f52fab6e55ddcd3c09390880eb72 https://github.com/pgroonga/pgroonga/commit/a6f9094b4d48f52fab6e55ddcd3c09390880eb72 Message: Add pgroonga.windows_event_source_name It requires Groonga 5.0.6 that isn't released yet. Added files: expected/variable/windows-event-source-name/valid.out sql/variable/windows-event-source-name/valid.sql Modified files: pgroonga.c Added: expected/variable/windows-event-source-name/valid.out (+27 -0) 100644 =================================================================== --- /dev/null +++ expected/variable/windows-event-source-name/valid.out 2015-07-26 19:37:31 +0900 (5cf0ed0) @@ -0,0 +1,27 @@ +-- To load PGroonga +SELECT pgroonga.command('status')::json->0->0; + ?column? +---------- + 0 +(1 row) + +SHOW pgroonga.windows_event_source_name; + pgroonga.windows_event_source_name +------------------------------------ + PGroonga +(1 row) + +SET pgroonga.windows_event_source_name = 'Groonga'; +SHOW pgroonga.windows_event_source_name; + pgroonga.windows_event_source_name +------------------------------------ + Groonga +(1 row) + +SET pgroonga.windows_event_source_name = default; +SHOW pgroonga.windows_event_source_name; + pgroonga.windows_event_source_name +------------------------------------ + PGroonga +(1 row) + Modified: pgroonga.c (+26 -0) =================================================================== --- pgroonga.c 2015-07-26 19:23:06 +0900 (f04d59b) +++ pgroonga.c 2015-07-26 19:37:31 +0900 (6ef756d) @@ -53,6 +53,9 @@ PG_MODULE_MAGIC; static bool PGrnIsLZ4Available; static relopt_kind PGrnReloptionKind; +#define PGrnDefaultWindowsEventSourceName "PGroonga" +static char *PGrnWindowsEventSourceName; + static int PGrnLogType; enum PGrnLogType { PGRN_LOG_TYPE_FILE, @@ -223,6 +226,16 @@ PGrnGetEncoding(void) } static void +PGrnWindowsEventSourceNameAssign(const char *new_value, void *extra) +{ + if (new_value) { + grn_windows_event_logger_set_source_name(new_value); + } else { + grn_windows_event_logger_set_source_name(PGrnDefaultWindowsEventSourceName); + } +} + +static void PGrnLogTypeAssign(int new_value, void *extra) { if (new_value == PGRN_LOG_TYPE_WINDOWS_EVENT_LOG) { @@ -255,6 +268,19 @@ PGrnLogLevelAssign(int new_value, void *extra) static void PGrnInitializeVariables(void) { + DefineCustomStringVariable("pgroonga.windows_event_source_name", + "Event source name on Windows for PGroonga.", + "The default is " + PGrnDefaultWindowsEventSourceName + ".", + &PGrnWindowsEventSourceName, + PGrnDefaultWindowsEventSourceName, + PGC_USERSET, + 0, + NULL, + PGrnWindowsEventSourceNameAssign, + NULL); + DefineCustomEnumVariable("pgroonga.log_type", "Log type for PGroonga.", "Available log types: " Added: sql/variable/windows-event-source-name/valid.sql (+8 -0) 100644 =================================================================== --- /dev/null +++ sql/variable/windows-event-source-name/valid.sql 2015-07-26 19:37:31 +0900 (50478dc) @@ -0,0 +1,8 @@ +-- To load PGroonga +SELECT pgroonga.command('status')::json->0->0; + +SHOW pgroonga.windows_event_source_name; +SET pgroonga.windows_event_source_name = 'Groonga'; +SHOW pgroonga.windows_event_source_name; +SET pgroonga.windows_event_source_name = default; +SHOW pgroonga.windows_event_source_name; -------------- next part -------------- HTML����������������������������...Download