Commit 16b30cbb authored by Eteri's avatar Eteri

use keep-alive true in fluentd config file

parent 02b48d26
...@@ -20,7 +20,7 @@ md5sum = 45c4adaae557bed5c25c24f4c4506b3d ...@@ -20,7 +20,7 @@ md5sum = 45c4adaae557bed5c25c24f4c4506b3d
[template-fluentd-config] [template-fluentd-config]
filename = templates/fluentd-conf.cnf.in filename = templates/fluentd-conf.cnf.in
md5sum = 88235b3b15cccc615acb6a9f9029684a md5sum = 85d7770376821f35c0cce782b716efc3
[template-caddy-service] [template-caddy-service]
filename = templates/template-caddy-service.sh.in filename = templates/template-caddy-service.sh.in
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#buffer_path "#{ENV['HOME']/var}" #buffer_path "#{ENV['HOME']/var}"
flush_interval 1s flush_interval 1s
num_threads 1 num_threads 1
use_keep_alive true
</match> </match>
......
...@@ -78,6 +78,7 @@ class TestIngestion(FluentdPluginTestCase): ...@@ -78,6 +78,7 @@ class TestIngestion(FluentdPluginTestCase):
print("serever shutdown") print("serever shutdown")
def setUp(self): def setUp(self):
self.caddy_process = psutil.Process(int(caddy_pid))
self.startServer() self.startServer()
def tearDown(self): def tearDown(self):
...@@ -88,6 +89,7 @@ class TestIngestion(FluentdPluginTestCase): ...@@ -88,6 +89,7 @@ class TestIngestion(FluentdPluginTestCase):
simple get request to be sure that server is up simple get request to be sure that server is up
''' '''
print("############## TEST 1 ##############") print("############## TEST 1 ##############")
print("conn_before = %s" %str(self.caddy_process.connections()))
url = self.computer_partition.getConnectionParameterDict()['url'] url = self.computer_partition.getConnectionParameterDict()['url']
resp = requests.get(url) resp = requests.get(url)
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
...@@ -104,20 +106,15 @@ class TestIngestion(FluentdPluginTestCase): ...@@ -104,20 +106,15 @@ class TestIngestion(FluentdPluginTestCase):
def test_keepAlive_on(self): def test_keepAlive_on(self):
print("############## TEST 3 ##############") print("############## TEST 3 ##############")
caddy_process = psutil.Process(int(caddy_pid))
port=9443
start_fluentd_cat(self, "dummyInputDelayCheckKeepAlive", "tag_test_3") start_fluentd_cat(self, "dummyInputDelayCheckKeepAlive", "tag_test_3")
time.sleep(10) time.sleep(10)
self.assertEqual( self.assertEqual(
['ESTABLISHED'], ['ESTABLISHED'],
[conn.status for conn in caddy_process.connections('inet') [conn.status for conn in self.caddy_process.connections('inet')
if len(conn.raddr) > 1 and conn.laddr.port == 4443]) if len(conn.raddr) > 1 and conn.laddr.port == 4443])
print("conn_afet = %s" %str(self.caddy_process.connections()))
#for conn in caddy_process.connections('inet'):
# if len(conn.raddr) > 1 and conn.laddr.port == 4443:
# self.assertEqual('ESTABLISHED', conn.status) #conn.status == 'ESTABLISHED' :
def test_ingest_with_15mins_delay(self): def test_ingest_with_15mins_delay(self):
''' '''
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment