Skip to content

Commit a01b640

Browse files
authored
Merge pull request #13 from waldophotos/vm-mem-hw-absolute
Config setting with vm_memory_high_watermark->absolute
2 parents 265302f + 92c9a4c commit a01b640

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ ENV RABBITMQ_ERLANG_COOKIE= \
1010
RABBITMQ_CLUSTER_PARTITION_HANDLING=ignore \
1111
ERL_EPMD_PORT=4369 \
1212
RABBITMQ_MANAGEMENT_PORT=15672 \
13-
MARATHON_URI=http://marathon.mesos:8080
13+
MARATHON_URI=http://marathon.mesos:8080 \
14+
RABBITMQ_VM_MEM_HW_ABSOLUTE=0
1415

15-
RUN apt-get update && apt-get install -y python python-pip
16+
17+
RUN apt-get update && apt-get install -y python python-pip openssl
1618

1719
RUN chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
1820
ADD ./rabbitmq-cluster.py /rabbitmq-cluster.py

rabbitmq-cluster.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ def create_rabbitmq_config_file(node_ips=None):
151151
net_ticktime = os.getenv('RABBITMQ_NET_TICKTIME', '60')
152152
cluster_partition_handling = os.getenv('RABBITMQ_CLUSTER_PARTITION_HANDLING', 'ignore')
153153
rabbitmq_management_port = os.getenv('RABBITMQ_MANAGEMENT_PORT', '/')
154+
vm_mem_hw_absolute = os.getenv('RABBITMQ_VM_MEM_HW_ABSOLUTE', '0')
155+
if vm_mem_hw_absolute == '0':
156+
vm_mem_hw_absolute = None
154157
with open(rabbitmq_config_file, 'w') as f:
155158
f.write('[\n')
156159
f.write(' {kernel, [{net_ticktime, %s}]},\n' % net_ticktime)
@@ -163,6 +166,8 @@ def create_rabbitmq_config_file(node_ips=None):
163166
f.write(' {default_vhost, <<"%s">>},\n' % default_vhost)
164167
f.write(' {cluster_partition_handling, %s},\n' % cluster_partition_handling)
165168
f.write(' {cluster_nodes, {[\n')
169+
if vm_mem_hw_absolute:
170+
f.write(' {vm_memory_high_watermark, {absolute, "%s"}}\n' % vm_mem_hw_absolute)
166171
if node_ips:
167172
nodes_str = ','.join(["'rabbit@%s'" % get_node_name(n)
168173
for n in node_ips])

0 commit comments

Comments
 (0)