]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
Add variable for clickhouse port
authorAnton Yuzhaninov <citrin+git@citrin.ru>
Wed, 24 Oct 2018 22:46:11 +0000 (18:46 -0400)
committerAnton Yuzhaninov <citrin+git@citrin.ru>
Wed, 24 Oct 2018 23:23:46 +0000 (19:23 -0400)
test/functional/cases/210_clickhouse/001_migration.robot
test/functional/cases/210_clickhouse/clickhouse.py
test/functional/configs/clickhouse-config.xml

index c2db5b3ec8d4cca532c0f3433d487b649a9ce104..f54f5c4a289d7378c4fabd1b8da22a6c1019ebf5 100644 (file)
@@ -11,6 +11,7 @@ Test Teardown  Clickhosue Teardown
 *** Variables ***
 ${CONFIG}       ${TESTDIR}/configs/clickhouse.conf
 ${RSPAMD_SCOPE}  Suite
+${CLICKHOUSE_PORT}  ${18123}
 
 *** Test Cases ***
 Initial schema
index 4e95eadf60f4ec8d75d8bb1336fb62dbc37c3e7c..f5e4646cd4304b09222af872d1277bc97ef1599b 100644 (file)
@@ -8,7 +8,7 @@ __client = None
 
 class Client:
     def __init__(self):
-        self.port = 18123
+        self.port = BuiltIn().get_variable_value('${CLICKHOUSE_PORT}', default=18123)
 
     def get_query_string(self):
         return "http://localhost:%d/?default_format=JSONEachRow" % (self.port)
index 10530a580b23212fc3e41488ed267983ec26ad6f..b210748ba681736e02231793a0db426a350a32ec 100644 (file)
@@ -10,7 +10,7 @@
         <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
     </logger>
     <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
-    <http_port>18123</http_port>
+    <http_port>${CLICKHOUSE_PORT}</http_port>
     <tcp_port>19000</tcp_port>
 
     <!-- For HTTPS and SSL over native protocol. -->