You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/09/18 21:22:23 UTC
[5/7] mesos git commit: Updated logging initialization arguments.
Updated logging initialization arguments.
The arguments `flags` and `installFailureSignalHandler` are now
swapped. The will allow the logging initialization to be more
broadly used in a future patch.
Review: https://reviews.apache.org/r/62357/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a16e1d66
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a16e1d66
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a16e1d66
Branch: refs/heads/master
Commit: a16e1d66bfb2af6b3cd39afd24ee395eec209927
Parents: 0cd254f
Author: Armand Grillet <ag...@mesosphere.io>
Authored: Mon Sep 18 20:45:02 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Sep 18 23:21:47 2017 +0200
----------------------------------------------------------------------
src/docker/executor.cpp | 2 +-
src/examples/load_generator_framework.cpp | 2 +-
src/examples/no_executor_framework.cpp | 2 +-
src/examples/persistent_volume_framework.cpp | 2 +-
src/examples/test_framework.cpp | 2 +-
src/examples/test_http_framework.cpp | 2 +-
src/exec/exec.cpp | 2 +-
src/executor/executor.cpp | 2 +-
src/launcher/default_executor.cpp | 2 +-
src/launcher/executor.cpp | 2 +-
src/launcher/fetcher.cpp | 2 +-
src/local/main.cpp | 2 +-
src/log/tool/benchmark.cpp | 2 +-
src/log/tool/initialize.cpp | 2 +-
src/log/tool/read.cpp | 2 +-
src/log/tool/replica.cpp | 2 +-
src/logging/logging.cpp | 4 ++--
src/logging/logging.hpp | 4 ++--
src/master/main.cpp | 2 +-
src/sched/sched.cpp | 2 +-
src/scheduler/scheduler.cpp | 2 +-
src/slave/main.cpp | 2 +-
src/tests/main.cpp | 2 +-
23 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/docker/executor.cpp
----------------------------------------------------------------------
diff --git a/src/docker/executor.cpp b/src/docker/executor.cpp
index e9949f6..3b0767f 100644
--- a/src/docker/executor.cpp
+++ b/src/docker/executor.cpp
@@ -806,7 +806,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+ mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/load_generator_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/load_generator_framework.cpp b/src/examples/load_generator_framework.cpp
index 653ae81..63c88b4 100644
--- a/src/examples/load_generator_framework.cpp
+++ b/src/examples/load_generator_framework.cpp
@@ -314,7 +314,7 @@ int main(int argc, char** argv)
}
// We want the logger to catch failure signals.
- mesos::internal::logging::initialize(argv[0], flags, true);
+ mesos::internal::logging::initialize(argv[0], true, flags);
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/no_executor_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/no_executor_framework.cpp b/src/examples/no_executor_framework.cpp
index 2ca240b..84fbf92 100644
--- a/src/examples/no_executor_framework.cpp
+++ b/src/examples/no_executor_framework.cpp
@@ -357,7 +357,7 @@ int main(int argc, char** argv)
taskResources.allocate(framework.role());
- logging::initialize(argv[0], flags, true); // Catch signals.
+ logging::initialize(argv[0], true, flags); // Catch signals.
NoExecutorScheduler scheduler(
framework,
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/persistent_volume_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/persistent_volume_framework.cpp b/src/examples/persistent_volume_framework.cpp
index bce2a2d..0c86808 100644
--- a/src/examples/persistent_volume_framework.cpp
+++ b/src/examples/persistent_volume_framework.cpp
@@ -558,7 +558,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- logging::initialize(argv[0], flags, true); // Catch signals.
+ logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/test_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_framework.cpp b/src/examples/test_framework.cpp
index a6b38f0..8356d22 100644
--- a/src/examples/test_framework.cpp
+++ b/src/examples/test_framework.cpp
@@ -249,7 +249,7 @@ int main(int argc, char** argv)
exit(EXIT_FAILURE);
}
- internal::logging::initialize(argv[0], flags, true); // Catch signals.
+ internal::logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/examples/test_http_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/test_http_framework.cpp b/src/examples/test_http_framework.cpp
index 693dd47..5665b4d 100644
--- a/src/examples/test_http_framework.cpp
+++ b/src/examples/test_http_framework.cpp
@@ -428,7 +428,7 @@ int main(int argc, char** argv)
}
process::initialize();
- mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+ mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/exec/exec.cpp
----------------------------------------------------------------------
diff --git a/src/exec/exec.cpp b/src/exec/exec.cpp
index 65c4575..cdbf149 100644
--- a/src/exec/exec.cpp
+++ b/src/exec/exec.cpp
@@ -649,7 +649,7 @@ MesosExecutorDriver::MesosExecutorDriver(mesos::Executor* _executor)
// Initialize logging.
if (flags.initialize_driver_logging) {
- logging::initialize("mesos", flags);
+ logging::initialize("mesos", false, flags);
} else {
VLOG(1) << "Disabling initialization of GLOG logging";
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/executor/executor.cpp
----------------------------------------------------------------------
diff --git a/src/executor/executor.cpp b/src/executor/executor.cpp
index 91bbd1e..7280951 100644
--- a/src/executor/executor.cpp
+++ b/src/executor/executor.cpp
@@ -179,7 +179,7 @@ public:
// Initialize logging.
if (flags.initialize_driver_logging) {
- logging::initialize("mesos", flags);
+ logging::initialize("mesos", false, flags);
} else {
VLOG(1) << "Disabling initialization of GLOG logging";
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/launcher/default_executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/default_executor.cpp b/src/launcher/default_executor.cpp
index 106b7f2..136c000 100644
--- a/src/launcher/default_executor.cpp
+++ b/src/launcher/default_executor.cpp
@@ -1487,7 +1487,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+ mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/launcher/executor.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/executor.cpp b/src/launcher/executor.cpp
index 951597b..0131577 100644
--- a/src/launcher/executor.cpp
+++ b/src/launcher/executor.cpp
@@ -1227,7 +1227,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- mesos::internal::logging::initialize(argv[0], flags, true); // Catch signals.
+ mesos::internal::logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/launcher/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
index 42980f5..ff24ecb 100644
--- a/src/launcher/fetcher.cpp
+++ b/src/launcher/fetcher.cpp
@@ -519,7 +519,7 @@ int main(int argc, char* argv[])
CHECK_SOME(load) << "Could not load flags: " << load.error();
- logging::initialize(argv[0], flags, true); // Catch signals.
+ logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/local/main.cpp
----------------------------------------------------------------------
diff --git a/src/local/main.cpp b/src/local/main.cpp
index f6145b7..4d9be69 100644
--- a/src/local/main.cpp
+++ b/src/local/main.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
- logging::initialize(argv[0], flags);
+ logging::initialize(argv[0], false, flags);
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/benchmark.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/benchmark.cpp b/src/log/tool/benchmark.cpp
index 8264fda..b939e26 100644
--- a/src/log/tool/benchmark.cpp
+++ b/src/log/tool/benchmark.cpp
@@ -123,7 +123,7 @@ Try<Nothing> Benchmark::execute(int argc, char** argv)
}
process::initialize();
- logging::initialize(argv[0], flags);
+ logging::initialize(argv[0], false, flags);
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/initialize.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/initialize.cpp b/src/log/tool/initialize.cpp
index 6a12505..c0f8543 100644
--- a/src/log/tool/initialize.cpp
+++ b/src/log/tool/initialize.cpp
@@ -64,7 +64,7 @@ Try<Nothing> Initialize::execute(int argc, char** argv)
}
process::initialize();
- logging::initialize(argv[0], flags);
+ logging::initialize(argv[0], false, flags);
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/read.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/read.cpp b/src/log/tool/read.cpp
index 7b30898..50fb020 100644
--- a/src/log/tool/read.cpp
+++ b/src/log/tool/read.cpp
@@ -80,7 +80,7 @@ Try<Nothing> Read::execute(int argc, char** argv)
}
process::initialize();
- logging::initialize(argv[0], flags);
+ logging::initialize(argv[0], false, flags);
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/log/tool/replica.cpp
----------------------------------------------------------------------
diff --git a/src/log/tool/replica.cpp b/src/log/tool/replica.cpp
index 45bd1f4..6c7183c 100644
--- a/src/log/tool/replica.cpp
+++ b/src/log/tool/replica.cpp
@@ -82,7 +82,7 @@ Try<Nothing> Replica::execute(int argc, char** argv)
}
process::initialize();
- logging::initialize(argv[0], flags);
+ logging::initialize(argv[0], false, flags);
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/logging/logging.cpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp
index 7085ab9..19dba7f 100644
--- a/src/logging/logging.cpp
+++ b/src/logging/logging.cpp
@@ -123,8 +123,8 @@ google::LogSeverity getLogSeverity(const string& logging_level)
void initialize(
const string& _argv0,
- const Option<Flags>& _flags,
- bool installFailureSignalHandler)
+ bool installFailureSignalHandler,
+ const Option<Flags>& _flags)
{
static Once* initialized = new Once();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/logging/logging.hpp
----------------------------------------------------------------------
diff --git a/src/logging/logging.hpp b/src/logging/logging.hpp
index 9ce1b1d..a837ae8 100644
--- a/src/logging/logging.hpp
+++ b/src/logging/logging.hpp
@@ -29,8 +29,8 @@ namespace logging {
void initialize(
const std::string& argv0,
- const Option<Flags>& _flags = None(),
- bool installFailureSignalHandler = false);
+ bool installFailureSignalHandler,
+ const Option<Flags>& _flags = None());
// Returns the log file for the provided severity level.
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 7e815bf..f65ce63 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -176,7 +176,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- logging::initialize(argv[0], flags, true); // Catch signals.
+ logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index ef73c1d..09f255e 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -1735,7 +1735,7 @@ void MesosSchedulerDriver::initialize() {
// Initialize logging.
// TODO(benh): Replace whitespace in framework.name() with '_'?
if (flags.initialize_driver_logging) {
- logging::initialize(framework.name(), flags);
+ logging::initialize(framework.name(), false, flags);
} else {
VLOG(1) << "Disabling initialization of GLOG logging";
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index ce69258..78f5370 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -176,7 +176,7 @@ public:
// Initialize logging.
if (flags.initialize_driver_logging) {
- logging::initialize("mesos", flags);
+ logging::initialize("mesos", false, flags);
} else {
VLOG(1) << "Disabling initialization of GLOG logging";
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/slave/main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/main.cpp b/src/slave/main.cpp
index d53ff50..94431b0 100644
--- a/src/slave/main.cpp
+++ b/src/slave/main.cpp
@@ -268,7 +268,7 @@ int main(int argc, char** argv)
return EXIT_FAILURE;
}
- logging::initialize(argv[0], flags, true); // Catch signals.
+ logging::initialize(argv[0], true, flags); // Catch signals.
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/a16e1d66/src/tests/main.cpp
----------------------------------------------------------------------
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index a7dc99b..6911b64 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
}
// Initialize logging.
- logging::initialize(argv[0], flags, true);
+ logging::initialize(argv[0], true, flags);
// Log any flag warnings (after logging is initialized).
foreach (const flags::Warning& warning, load->warnings) {