Kouhei Sutou
null+****@clear*****
Mon Jul 27 10:48:25 JST 2015
Kouhei Sutou 2015-07-27 10:48:25 +0900 (Mon, 27 Jul 2015) New Revision: a0556e2122fb79d626043fa73d04be3557d723b1 https://github.com/pgroonga/pgroonga/commit/a0556e2122fb79d626043fa73d04be3557d723b1 Message: Revert "Add pgroonga.windows_event_source_name" This reverts commit a6f9094b4d48f52fab6e55ddcd3c09390880eb72. We should use "Windows Event Log"(*1) API rather than "Event Logging"(*2) API. Because "Windows Event Log" API is the replacement API for "Event Logging" API. (*1) https://msdn.microsoft.com/en-us/library/windows/desktop/aa385780%28v=vs.85%29.aspx (*2) https://msdn.microsoft.com/en-us/library/windows/desktop/aa363652%28v=vs.85%29.aspx Removed files: expected/variable/windows-event-source-name/valid.out sql/variable/windows-event-source-name/valid.sql Modified files: pgroonga.c Deleted: expected/variable/windows-event-source-name/valid.out (+0 -27) 100644 =================================================================== --- expected/variable/windows-event-source-name/valid.out 2015-07-26 19:51:39 +0900 (5cf0ed0) +++ /dev/null @@ -1,27 +0,0 @@ --- 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 (+0 -26) =================================================================== --- pgroonga.c 2015-07-26 19:51:39 +0900 (6ef756d) +++ pgroonga.c 2015-07-27 10:48:25 +0900 (f04d59b) @@ -53,9 +53,6 @@ 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, @@ -226,16 +223,6 @@ 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) { @@ -268,19 +255,6 @@ 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: " Deleted: sql/variable/windows-event-source-name/valid.sql (+0 -8) 100644 =================================================================== --- sql/variable/windows-event-source-name/valid.sql 2015-07-26 19:51:39 +0900 (50478dc) +++ /dev/null @@ -1,8 +0,0 @@ --- 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����������������������������...ダウンロード
