[Feature] File sink with move rotation registration.

File sink with move rotation watcher can now be registered via repository.
3Hren · Sep 24, 2014 · 9887fe2 · 9887fe2
1 parent 7c4717d
commit 9887fe2
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/src/blackhole/sink/files.hpp b/src/blackhole/sink/files.hpp
@@ -143,9 +143,14 @@ struct unique_id_traits<sink::files_t<Backend, sink::rotator_t<Backend, Watcher>
         if (rotation_it != cfg.end()) {
             const dynamic_t::object_t& rotation = rotation_it->second.to<dynamic_t::object_t>();
 
+            const bool has_move_watcher = rotation.find("move") != rotation.end();
             const bool has_size_watcher = rotation.find("size") != rotation.end();
             const bool has_datetime_watcher = rotation.find("period") != rotation.end();
 
+            if (has_move_watcher) {
+                return utils::format("%s/%s/%s", sink_type::name(), rotator_type::name(), "move");
+            }
+
             if (has_size_watcher && has_datetime_watcher) {
                 throw blackhole::error_t("set watcher is not implemented yet");
             } else if (has_size_watcher) {
@@ -213,6 +218,18 @@ struct factory_traits<sink::files_t<Backend>> {
     }
 };
 
+template<class Backend>
+struct factory_traits<sink::files_t<Backend, sink::rotator_t<Backend, sink::rotation::watcher::move_t>>> {
+    typedef sink::rotation::watcher::move_t watcher_type;
+    typedef sink::rotator_t<Backend, watcher_type> rotator_type;
+    typedef sink::files_t<Backend, rotator_type> sink_type;
+    typedef typename sink_type::config_type config_type;
+
+    static void map_config(const aux::extractor<sink_type>& ex, config_type& config) {
+        aux::filler<sink_type>::extract_to(ex, config);
+    }
+};
+
 template<class Backend>
 struct factory_traits<sink::files_t<Backend, sink::rotator_t<Backend, sink::rotation::watcher::size_t>>> {
     typedef sink::rotation::watcher::size_t watcher_type;

diff --git a/src/tests/test_FactoryInitialization.cpp b/src/tests/test_FactoryInitialization.cpp
@@ -63,6 +63,30 @@ TEST(Factory, FileStringsFrontend) {
     EXPECT_TRUE(bool(factory.create(formatter, sink)));
 }
 
+TEST(Repository, RotationFileStringsFrontendWithMoveWatcher) {
+    external_factory_t factory;
+    factory.add<
+        sink::files_t<
+            sink::files::boost_backend_t,
+            sink::rotator_t<
+                sink::files::boost_backend_t,
+                sink::rotation::watcher::move_t
+            >
+        >,
+        formatter::string_t
+    >();
+
+    formatter_config_t formatter("string");
+    formatter["pattern"] = "[%(timestamp)s]: %(message)s";
+
+    sink_config_t sink("files");
+    sink["path"] = "/dev/stdout";
+    sink["autoflush"] = true;
+    sink["rotation"]["move"] = true;
+
+    EXPECT_TRUE(bool(factory.create(formatter, sink)));
+}
+
 TEST(Repository, RotationFileStringsFrontendWithSizeWatcher) {
     external_factory_t factory;
     factory.add<