* Updated setenv2.sh script, KILLBILL_QUEUE_CREATOR_NAME is set only …

…if KILLBILL_QUEUE_CREATOR_AUTOGENERATE_NAME set to false. * Notification queue mode is set to POLLING by default.
killbill · Nov 2, 2024 · 6d901c4 · 6d901c4
1 parent 22f7822
commit 6d901c4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/ansible/templates/killbill/conf/setenv2.sh.j2 b/ansible/templates/killbill/conf/setenv2.sh.j2
@@ -1,5 +1,10 @@
 # Java Properties
 export CATALINA_OPTS="$CATALINA_OPTS
-                      -Dorg.killbill.queue.creator.name=${KILLBILL_QUEUE_CREATOR_NAME:-{{ inventory_hostname }}}
+                      -Dorg.killbill.queue.creator.autoGeneratedName=${KILLBILL_QUEUE_CREATOR_AUTOGENERATE_NAME:-true}
                       -Dorg.killbill.server.properties=file://{{ kb_config_dir }}/killbill.properties
                       {{ kb_system_properties }}"
+
+
+if [ "$KILLBILL_QUEUE_CREATOR_AUTOGENERATE_NAME" = "false" ]; then
+  export CATALINA_OPTS="$CATALINA_OPTS -Dorg.killbill.queue.creator.name=${KILLBILL_QUEUE_CREATOR_NAME:-{{ inventory_hostname }}}"
+fi
diff --git a/docker/templates/killbill/latest/Dockerfile.template b/docker/templates/killbill/latest/Dockerfile.template
@@ -14,6 +14,8 @@ ENV KB_org_killbill_server_baseUrl=http://$ENV_HOST_IP:8080
 ENV KB_org_killbill_billing_plugin_kpm_kpmPath=$KPM_INSTALL_DIR/kpm-latest/kpm
 ENV KB_org_killbill_billing_plugin_kpm_bundlesPath=$KILLBILL_INSTALL_DIR/bundles
 ENV KB_org_killbill_security_shiroResourcePath=$KILLBILL_INSTALL_DIR/config/shiro.ini
+ENV KB_org_killbill_notificationq_main_queue_mode=POLLING
+ENV KB_org_killbill_notificationq_analytics_queue_mode=POLLING
 ENV KB_ADMIN_PASSWORD=password
 
 # Default kpm.yml, override as needed

diff --git a/docker/templates/killbill/latest/setenv2.sh b/docker/templates/killbill/latest/setenv2.sh
@@ -1,9 +1,13 @@
 # Java Properties
 export CATALINA_OPTS="$CATALINA_OPTS
-                      -Dorg.killbill.queue.creator.name=${KILLBILL_QUEUE_CREATOR_NAME:-localhost}
+                      -Dorg.killbill.queue.creator.autoGeneratedName=${KILLBILL_QUEUE_CREATOR_AUTOGENERATE_NAME:-true}
                       -Dorg.killbill.server.properties=file://$KILLBILL_INSTALL_DIR/killbill.properties
                       "
 
+if [ "$KILLBILL_QUEUE_CREATOR_AUTOGENERATE_NAME" = "false" ]; then
+  export CATALINA_OPTS="$CATALINA_OPTS -Dorg.killbill.queue.creator.name=${KILLBILL_QUEUE_CREATOR_NAME:-localhost}"
+fi
+
 #
 # Load legacy properties (backward compatibility)
 #