You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by vo...@apache.org on 2018/08/29 02:24:24 UTC
[rocketmq] branch develop updated: [ISSUE430]Remove scripts releate
to filtersrv (#431)
This is an automated email from the ASF dual-hosted git repository.
vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 37a642c [ISSUE430]Remove scripts releate to filtersrv (#431)
37a642c is described below
commit 37a642cc12730873f505dcc4130aa73be4df3999
Author: duheng <39...@users.noreply.github.com>
AuthorDate: Wed Aug 29 10:24:19 2018 +0800
[ISSUE430]Remove scripts releate to filtersrv (#431)
---
.../java/org/apache/rocketmq/common/MQVersion.java | 2 +-
distribution/bin/mqfiltersrv | 45 -----------
distribution/bin/mqfiltersrv.cmd | 23 ------
distribution/bin/mqfiltersrv.xml | 45 -----------
distribution/conf/logback_filtersrv.xml | 87 ----------------------
5 files changed, 1 insertion(+), 201 deletions(-)
diff --git a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
index 96a2329..6c2712d 100644
--- a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
+++ b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java
@@ -18,7 +18,7 @@ package org.apache.rocketmq.common;
public class MQVersion {
- public static final int CURRENT_VERSION = Version.V4_3_0.ordinal();
+ public static final int CURRENT_VERSION = Version.V4_3_1.ordinal();
public static String getVersionDesc(int value) {
int length = Version.values().length;
diff --git a/distribution/bin/mqfiltersrv b/distribution/bin/mqfiltersrv
deleted file mode 100644
index 2fd0cbe..0000000
--- a/distribution/bin/mqfiltersrv
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ -z "$ROCKETMQ_HOME" ] ; then
- ## resolve links - $0 may be a link to maven's home
- PRG="$0"
-
- # need this for relative symlinks
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
- done
-
- saveddir=`pwd`
-
- ROCKETMQ_HOME=`dirname "$PRG"`/..
-
- # make it fully qualified
- ROCKETMQ_HOME=`cd "$ROCKETMQ_HOME" && pwd`
-
- cd "$saveddir"
-fi
-
-export ROCKETMQ_HOME
-
-sh ${ROCKETMQ_HOME}/bin/runserver.sh org.apache.rocketmq.filtersrv.FiltersrvStartup $@
diff --git a/distribution/bin/mqfiltersrv.cmd b/distribution/bin/mqfiltersrv.cmd
deleted file mode 100644
index 0503026..0000000
--- a/distribution/bin/mqfiltersrv.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo off
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-
-if not exist "%ROCKETMQ_HOME%\bin\runbroker.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & EXIT /B 1
-
-call "%ROCKETMQ_HOME%\bin\runserver.cmd" org.apache.rocketmq.filtersrv.FiltersrvStartup %*
-
-IF %ERRORLEVEL% EQU 0 (
- ECHO "Filtersrv starts OK"
-)
\ No newline at end of file
diff --git a/distribution/bin/mqfiltersrv.xml b/distribution/bin/mqfiltersrv.xml
deleted file mode 100644
index dc36a8d..0000000
--- a/distribution/bin/mqfiltersrv.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<java>
- <debug>false</debug>
-
- <javahome>${JAVA_HOME}</javahome>
-
- <jvmtype>server</jvmtype>
-
- <mainclass>org.apache.rocketmq.filtersrv.FiltersrvStartup</mainclass>
-
- <properties>
- <java.ext.dirs>${cpd}/../lib</java.ext.dirs>
- <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir>
- </properties>
-
- <classpaths>
- </classpaths>
-
- <options>
- <-Xms512m>
- </-Xms512m>
- <-Xmx1g>
-</-Xmx1g>
-<-XX:NewSize>256M</-XX:NewSize>
-<-XX:MaxNewSize>512M</-XX:MaxNewSize>
-<-XX:PermSize>128M</-XX:PermSize>
-<-XX:MaxPermSize>128M</-XX:MaxPermSize>
- </options>
- </java>
diff --git a/distribution/conf/logback_filtersrv.xml b/distribution/conf/logback_filtersrv.xml
deleted file mode 100644
index 71b9a93..0000000
--- a/distribution/conf/logback_filtersrv.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<configuration>
- <appender name="DefaultAppender"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${user.home}/logs/rocketmqlogs/filtersrv_default.log</file>
- <append>true</append>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${user.home}/logs/rocketmqlogs/otherdays/filtersrv_default.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>100MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>%d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n</pattern>
- <charset class="java.nio.charset.Charset">UTF-8</charset>
- </encoder>
- </appender>
-
- <appender name="RocketmqFiltersrvAppender_inner"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${user.home}/logs/rocketmqlogs/filtersrv.log</file>
- <append>true</append>
- <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${user.home}/logs/rocketmqlogs/otherdays/filtersrv.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>100MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>%d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n</pattern>
- <charset class="java.nio.charset.Charset">UTF-8</charset>
- </encoder>
- </appender>
- <appender name="RocketmqFiltersrvAppender" class="ch.qos.logback.classic.AsyncAppender">
- <appender-ref ref="RocketmqFiltersrvAppender_inner"/>
- <discardingThreshold>0</discardingThreshold>
- </appender>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <append>true</append>
- <encoder>
- <pattern>%d{yyy-MM-dd HH\:mm\:ss,SSS} %p %t - %m%n</pattern>
- <charset class="java.nio.charset.Charset">UTF-8</charset>
- </encoder>
- </appender>
-
- <logger name="RocketmqFiltersrv" additivity="false">
- <level value="INFO"/>
- <appender-ref ref="RocketmqFiltersrvAppender"/>
- </logger>
-
- <logger name="RocketmqCommon" additivity="false">
- <level value="INFO"/>
- <appender-ref ref="RocketmqFiltersrvAppender"/>
- </logger>
-
- <logger name="RocketmqRemoting" additivity="false">
- <level value="INFO"/>
- <appender-ref ref="RocketmqFiltersrvAppender"/>
- </logger>
-
- <root>
- <level value="INFO"/>
- <appender-ref ref="DefaultAppender"/>
- </root>
-</configuration>