From b442e68fedde5ca1cf2dce1d18eeba75d03e1477 Mon Sep 17 00:00:00 2001 From: Simran Date: Fri, 22 Mar 2019 12:28:09 +0100 Subject: [PATCH] Doc - setIntroducedIn for log.file-group/mode (#8486) --- Documentation/Examples/arangobench.json | 34 +++++++++++++++++++++++ Documentation/Examples/arangod.json | 34 +++++++++++++++++++++++ Documentation/Examples/arangodump.json | 34 +++++++++++++++++++++++ Documentation/Examples/arangoexport.json | 34 +++++++++++++++++++++++ Documentation/Examples/arangoimport.json | 34 +++++++++++++++++++++++ Documentation/Examples/arangoinspect.json | 34 +++++++++++++++++++++++ Documentation/Examples/arangorestore.json | 34 +++++++++++++++++++++++ Documentation/Examples/arangosh.json | 34 +++++++++++++++++++++++ lib/Logger/LoggerFeature.cpp | 8 ++++-- 9 files changed, 278 insertions(+), 2 deletions(-) diff --git a/Documentation/Examples/arangobench.json b/Documentation/Examples/arangobench.json index 2968f18c42..f7b3eb8704 100644 --- a/Documentation/Examples/arangobench.json +++ b/Documentation/Examples/arangobench.json @@ -254,6 +254,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/Documentation/Examples/arangod.json b/Documentation/Examples/arangod.json index faf3f08aca..5e28786f57 100644 --- a/Documentation/Examples/arangod.json +++ b/Documentation/Examples/arangod.json @@ -1807,6 +1807,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/Documentation/Examples/arangodump.json b/Documentation/Examples/arangodump.json index 768796d3d9..ccca9fb587 100644 --- a/Documentation/Examples/arangodump.json +++ b/Documentation/Examples/arangodump.json @@ -269,6 +269,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/Documentation/Examples/arangoexport.json b/Documentation/Examples/arangoexport.json index 09d41db4ff..6a99f44f0c 100644 --- a/Documentation/Examples/arangoexport.json +++ b/Documentation/Examples/arangoexport.json @@ -185,6 +185,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/Documentation/Examples/arangoimport.json b/Documentation/Examples/arangoimport.json index b94fada12d..c05aa48018 100644 --- a/Documentation/Examples/arangoimport.json +++ b/Documentation/Examples/arangoimport.json @@ -297,6 +297,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/Documentation/Examples/arangoinspect.json b/Documentation/Examples/arangoinspect.json index d600535331..99fb6efcb6 100644 --- a/Documentation/Examples/arangoinspect.json +++ b/Documentation/Examples/arangoinspect.json @@ -488,6 +488,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/Documentation/Examples/arangorestore.json b/Documentation/Examples/arangorestore.json index b3b55c25b4..1adf545eea 100644 --- a/Documentation/Examples/arangorestore.json +++ b/Documentation/Examples/arangorestore.json @@ -362,6 +362,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/Documentation/Examples/arangosh.json b/Documentation/Examples/arangosh.json index b716c7931f..57b1d67f29 100644 --- a/Documentation/Examples/arangosh.json +++ b/Documentation/Examples/arangosh.json @@ -489,6 +489,40 @@ "section" : "log", "type" : "string" }, + "log.file-group" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "group to use for new log file, user must be a member of this group", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, + "log.file-mode" : { + "category" : "option", + "default" : "", + "deprecatedIn" : null, + "description" : "mode to use for new log file, umask will be applied as well", + "dynamic" : false, + "enterpriseOnly" : false, + "hidden" : false, + "introducedIn" : [ + "v3.4.5", + "v3.5.0" + ], + "obsolete" : false, + "requiresValue" : true, + "section" : "log", + "type" : "string" + }, "log.force-direct" : { "category" : "option", "default" : false, diff --git a/lib/Logger/LoggerFeature.cpp b/lib/Logger/LoggerFeature.cpp index 3f7e5ea54a..1867c6cc5c 100644 --- a/lib/Logger/LoggerFeature.cpp +++ b/lib/Logger/LoggerFeature.cpp @@ -93,12 +93,16 @@ void LoggerFeature::collectOptions(std::shared_ptr options) { options->addOption("--log.file-mode", "mode to use for new log file, umask will be applied as well", - new StringParameter(&_fileMode)); + new StringParameter(&_fileMode)) + .setIntroducedIn(30405) + .setIntroducedIn(30500); #ifdef ARANGODB_HAVE_SETGID options->addOption("--log.file-group", "group to use for new log file, user must be a member of this group", - new StringParameter(&_fileGroup)); + new StringParameter(&_fileGroup)) + .setIntroducedIn(30405) + .setIntroducedIn(30500); #endif options->addOption("--log.prefix", "prefix log message with this string",