update

piplus-backend-v5-mycat-docker/conf-prod/log4j2.xml

@@ -7,28 +7,11 @@
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d [%-5p][%t] %m %throwable{full} (%C:%F:%L) %n"/>
         </Console>
-
-        <!-- <RollingFile name="RollingFile" fileName="${sys:MYCAT_HOME}/logs/mycat.log"
-                     filePattern="${sys:MYCAT_HOME}/logs/$${date:yyyy-MM}/mycat-%d{MM-dd}-%i.log.gz">
-            <PatternLayout>
-                <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p [%t] (%l) - %m%n</Pattern>
-            </PatternLayout>
-            <Policies>
-                <OnStartupTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="250 MB"/>
-                <TimeBasedTriggeringPolicy/>
-            </Policies>
-        </RollingFile> -->
-
         <Socket name="Logstash" host="v5-prod-logstash" port="4560" protocol="TCP">
             <PatternLayout pattern="${PATTERN}" />
         </Socket>
     </Appenders>
     <Loggers>
-        <!--<AsyncLogger name="io.mycat" level="info" includeLocation="true" additivity="false">-->
-            <!--<AppenderRef ref="Console"/>-->
-            <!--<AppenderRef ref="RollingFile"/>-->
-        <!--</AsyncLogger>-->
         <asyncRoot level="info" includeLocation="true">
             <AppenderRef ref="Console" />
             <!-- <AppenderRef ref="RollingFile"/> -->

piplus-backend-v5-rabbitmq-docker/Dockerfile

@@ -50,8 +50,8 @@ ENV RABBITMQ_LOGS=- RABBITMQ_SASL_LOGS=-
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0A9AF2115F4687BD29803A206B73A36E6026DFCA
 RUN echo 'deb http://www.rabbitmq.com/debian testing main' > /etc/apt/sources.list.d/rabbitmq.list
 
-ENV RABBITMQ_VERSION 3.6.5
-ENV RABBITMQ_DEBIAN_VERSION 3.6.5-1
+ENV RABBITMQ_VERSION 3.6.6
+ENV RABBITMQ_DEBIAN_VERSION 3.6.6-1
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		rabbitmq-server=$RABBITMQ_DEBIAN_VERSION \
@@ -65,20 +65,19 @@ RUN echo '[ { rabbit, [ { loopback_users, [ ] } ] } ].' > /etc/rabbitmq/rabbitmq
 # set home so that any `--user` knows where to put the erlang cookie
 ENV HOME /var/lib/rabbitmq
 
+ADD erlang.cookie /var/lib/rabbitmq/.erlang.cookie
+RUN chown -R rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie
+RUN chmod 600 /var/lib/rabbitmq/.erlang.cookie
+
 RUN mkdir -p /var/lib/rabbitmq /etc/rabbitmq /opt/rabbit \
 	&& chown -R rabbitmq:rabbitmq /var/lib/rabbitmq /etc/rabbitmq /opt/rabbit \
-	&& chmod 777 /var/lib/rabbitmq /etc/rabbitmq /opt/rabbit
+	&& chmod 777 /var/lib/rabbitmq /etc/rabbitmq
 VOLUME /var/lib/rabbitmq
 
-#cluster config
-ENV ERLANGCOOKIE ERLANGCOOKIE
-ENV CLUSTERED false
-ENV CLUSTER_WITH rabbit1
-ENV RAM_NODE false
-RUN echo "$ERLANGCOOKIE" > /var/lib/rabbitmq/.erlang.cookie
+COPY startrabbit.sh /usr/local/bin/
+RUN ln -s usr/local/bin/startrabbit.sh / # backwards compat
+RUN chmod a+x usr/local/bin/startrabbit.sh
 
-ADD startrabbit.sh /opt/rabbit/
-RUN chmod a+x /opt/rabbit/startrabbit.sh
 
 # add a symlink to the .erlang.cookie in /root so we can "docker exec rabbitmqctl ..." without gosu
 RUN ln -sf /var/lib/rabbitmq/.erlang.cookie /root/
@@ -86,7 +85,7 @@ RUN ln -sf /var/lib/rabbitmq/.erlang.cookie /root/
 RUN ln -sf /usr/lib/rabbitmq/lib/rabbitmq_server-$RABBITMQ_VERSION/plugins /plugins
 
 #enable management plugins
-RUN rabbitmq-plugins enable rabbitmq_mqtt rabbitmq_stomp rabbitmq_management  rabbitmq_management_agent rabbitmq_management_visualiser rabbitmq_federation rabbitmq_federation_management sockjs
+RUN rabbitmq-plugins enable --offline rabbitmq_management
 
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
@@ -94,15 +93,6 @@ RUN chmod a+x usr/local/bin/docker-entrypoint.sh
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 
-EXPOSE 5672
-EXPOSE 15672
-EXPOSE 25672
-EXPOSE 4369
-EXPOSE 9100
-EXPOSE 9101
-EXPOSE 9102
-EXPOSE 9103
-EXPOSE 9104
-EXPOSE 9105
+EXPOSE 4369 5671 5672 25672 15671 15672
 
-CMD /opt/rabbit/startrabbit.sh
+CMD startrabbit.sh

piplus-backend-v5-rabbitmq-docker/docker-compose.yml

+rabbit1:
+  image: rabbitmq-server
+  hostname: rabbit1
+  ports:
+    - "5672:5672"
+    - "15672:15672"
+  environment:
+   - RABBITMQ_ERLANG_COOKIE=terran123456
+  volumes:
+   - /var/lib/rabbitmq
+
+rabbit2:
+  image: rabbitmq-server
+  hostname: rabbit2
+  links:
+    - rabbit1
+  environment:
+   - CLUSTERED=true
+   - RABBITMQ_ERLANG_COOKIE=terran123456
+   - CLUSTER_WITH=rabbit1
+   - RAM_NODE=true
+  ports:
+      - "5673:5672"
+      - "15673:15672"
+  volumes:
+   - /var/lib/rabbitmq
+
+rabbit3:
+  image: rabbitmq-server
+  hostname: rabbit3
+  links:
+    - rabbit1
+    - rabbit2
+  environment:
+   - CLUSTERED=true
+   - RABBITMQ_ERLANG_COOKIE=terran123456
+   - CLUSTER_WITH=rabbit1
+  ports:
+        - "5674:5672"
+  volumes:
+   - /var/lib/rabbitmq

piplus-backend-v5-rabbitmq-docker/docker-entrypoint.sh

@@ -126,19 +126,19 @@ if [ "$(hostname)" != "$(hostname -s)" ]; then
 	: "${RABBITMQ_USE_LONGNAME:=true}"
 fi
 
-if [ "${RABBITMQ_ERLANG_COOKIE:-}" ]; then
-	cookieFile='/var/lib/rabbitmq/.erlang.cookie'
-	if [ -e "$cookieFile" ]; then
-		if [ "$(cat "$cookieFile" 2>/dev/null)" != "$RABBITMQ_ERLANG_COOKIE" ]; then
-			echo >&2
-			echo >&2 "warning: $cookieFile contents do not match RABBITMQ_ERLANG_COOKIE"
-			echo >&2
-		fi
-	else
-		echo "$RABBITMQ_ERLANG_COOKIE" > "$cookieFile"
-		chmod 600 "$cookieFile"
-	fi
-fi
+# if [ "${RABBITMQ_ERLANG_COOKIE:-}" ]; then
+# 	cookieFile='/var/lib/rabbitmq/.erlang.cookie'
+# 	if [ -e "$cookieFile" ]; then
+# 		if [ "$(cat "$cookieFile" 2>/dev/null)" != "$RABBITMQ_ERLANG_COOKIE" ]; then
+# 			echo >&2
+# 			echo >&2 "warning: $cookieFile contents do not match RABBITMQ_ERLANG_COOKIE"
+# 			echo >&2
+# 		fi
+# 	else
+# 		echo "$RABBITMQ_ERLANG_COOKIE" > "$cookieFile"
+# 		chmod 600 "$cookieFile"
+# 	fi
+# fi
 
 # prints "$2$1$3$1...$N"
 join() {

piplus-backend-v5-rabbitmq-docker/erlang.cookie

+terran123456

piplus-backend-v5-rabbitmq-docker/startrabbit.sh

@@ -9,7 +9,7 @@ else
 		# cluster
 		/usr/sbin/rabbitmq-server
 	else
-		/usr/sbin/rabbitmq-server -detached
+		/usr/sbin/rabbitmq-server >/var/lib/rabbitmq/log/rabbit\@$HOSTNAME.log &
 		rabbitmqctl stop_app
 		if [ -z "$RAM_NODE" ]; then
 			rabbitmqctl join_cluster rabbit@$CLUSTER_WITH
@@ -17,8 +17,6 @@ else
 			rabbitmqctl join_cluster --ram rabbit@$CLUSTER_WITH
 		fi
 		rabbitmqctl start_app
-
-		# Tail to keep the a foreground process active..
-		tail -f /var/log/rabbitmq/rabbit\@$HOSTNAME.log
+		tail -f var/lib/rabbitmq/log/rabbit\@$HOSTNAME.log
 	fi
 fi