stop() now kills all created fibers

Author: patapenka-alexey

metrics/plugins/graphite.lua

@@ -92,11 +92,6 @@ function graphite.init(opts)
     local sock = socket('AF_INET', 'SOCK_DGRAM', 'udp')
     assert(sock ~= nil, 'Socket creation failed')
 
-    -- for _, v in ipairs(GRAPHITE_FIBERS) do
-    --     if v.name == graphite_fiber.name then
-    --         error('failed to start fiber: ' .. graphite_fiber.name .. ", already exist")
-    --     end
-    -- end
     for name in pairs(GRAPHITE_FIBERS) do
         if name == graphite_fiber.name then
             error('failed to start fiber: ' .. graphite_fiber.name .. ", already exist")
@@ -115,25 +110,13 @@ function graphite.init(opts)
     GRAPHITE_FIBERS[graphite_fiber.name] = graphite_fiber
 end
 
-function graphite.stop(opts)
-    checks {
-        prefix = '?string',
-        host = '?string',
-        port = '?number',
-        send_interval = '?number'
-    }
-
-    local graphite_fiber = create_fiber_table(opts)
-
+function graphite.stop()
+    -- stop should kill all registered fibers due to
+    -- "require('config'):reload()" could be called on instance.
     for name in pairs(GRAPHITE_FIBERS) do
-        if name == graphite_fiber.name then
-            fiber.kill(GRAPHITE_FIBERS[name].fiber)
-            GRAPHITE_FIBERS[name] = nil
-            return
-        end
+        fiber.kill(GRAPHITE_FIBERS[name].fiber)
     end
-
-    error("failed to stop fiber: " .. graphite_fiber.name .. ", doesn't exist")
+    GRAPHITE_FIBERS = {}
 end
 
 return graphite

test/plugins/graphite_test.lua

@@ -180,7 +180,7 @@ g.test_graphite_stop_default_fibers = function(cg)
         graphite.init({})
         t.assert_equals(count_workers(), 1)
 
-        graphite.stop({})
+        graphite.stop()
         fiber.yield()
         t.assert_equals(count_workers(), 0)
     end)
@@ -219,11 +219,7 @@ g.test_graphite_stop_custom_fiber = function(cg)
 
         t.assert_equals(count_workers(), 2)
 
-        graphite.stop(opts)
-        fiber.yield()
-        t.assert_equals(count_workers(), 1)
-
-        graphite.stop(opts2)
+        graphite.stop()
         fiber.yield()
         t.assert_equals(count_workers(), 0)
     end)