Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Apache RocketMQ
Rocketmq
提交
36e675df
R
Rocketmq
项目概览
Apache RocketMQ
/
Rocketmq
上一次同步 大约 3 年
通知
267
Star
16139
Fork
68
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
36e675df
编写于
5月 26, 2017
作者:
L
Li Zhanhui
提交者:
dongeforever
6月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ROCKETMQ-178] Fix -p -m options closes apache/incubator-rocketmq#93
上级
6755cad7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
15 deletion
+23
-15
broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
...c/main/java/org/apache/rocketmq/broker/BrokerStartup.java
+17
-15
common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
.../java/org/apache/rocketmq/common/constant/LoggerName.java
+1
-0
distribution/conf/logback_broker.xml
distribution/conf/logback_broker.xml
+5
-0
未找到文件。
broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java
浏览文件 @
36e675df
...
@@ -103,20 +103,6 @@ public class BrokerStartup {
...
@@ -103,20 +103,6 @@ public class BrokerStartup {
messageStoreConfig
.
setAccessMessageInMemoryMaxRatio
(
ratio
);
messageStoreConfig
.
setAccessMessageInMemoryMaxRatio
(
ratio
);
}
}
if
(
commandLine
.
hasOption
(
'p'
))
{
MixAll
.
printObjectProperties
(
null
,
brokerConfig
);
MixAll
.
printObjectProperties
(
null
,
nettyServerConfig
);
MixAll
.
printObjectProperties
(
null
,
nettyClientConfig
);
MixAll
.
printObjectProperties
(
null
,
messageStoreConfig
);
System
.
exit
(
0
);
}
else
if
(
commandLine
.
hasOption
(
'm'
))
{
MixAll
.
printObjectProperties
(
null
,
brokerConfig
,
true
);
MixAll
.
printObjectProperties
(
null
,
nettyServerConfig
,
true
);
MixAll
.
printObjectProperties
(
null
,
nettyClientConfig
,
true
);
MixAll
.
printObjectProperties
(
null
,
messageStoreConfig
,
true
);
System
.
exit
(
0
);
}
if
(
commandLine
.
hasOption
(
'c'
))
{
if
(
commandLine
.
hasOption
(
'c'
))
{
String
file
=
commandLine
.
getOptionValue
(
'c'
);
String
file
=
commandLine
.
getOptionValue
(
'c'
);
if
(
file
!=
null
)
{
if
(
file
!=
null
)
{
...
@@ -181,8 +167,24 @@ public class BrokerStartup {
...
@@ -181,8 +167,24 @@ public class BrokerStartup {
configurator
.
setContext
(
lc
);
configurator
.
setContext
(
lc
);
lc
.
reset
();
lc
.
reset
();
configurator
.
doConfigure
(
brokerConfig
.
getRocketmqHome
()
+
"/conf/logback_broker.xml"
);
configurator
.
doConfigure
(
brokerConfig
.
getRocketmqHome
()
+
"/conf/logback_broker.xml"
);
log
=
LoggerFactory
.
getLogger
(
LoggerName
.
BROKER_LOGGER_NAME
);
if
(
commandLine
.
hasOption
(
'p'
))
{
Logger
console
=
LoggerFactory
.
getLogger
(
LoggerName
.
BROKER_CONSOLE_NAME
);
MixAll
.
printObjectProperties
(
console
,
brokerConfig
);
MixAll
.
printObjectProperties
(
console
,
nettyServerConfig
);
MixAll
.
printObjectProperties
(
console
,
nettyClientConfig
);
MixAll
.
printObjectProperties
(
console
,
messageStoreConfig
);
System
.
exit
(
0
);
}
else
if
(
commandLine
.
hasOption
(
'm'
))
{
Logger
console
=
LoggerFactory
.
getLogger
(
LoggerName
.
BROKER_CONSOLE_NAME
);
MixAll
.
printObjectProperties
(
console
,
brokerConfig
,
true
);
MixAll
.
printObjectProperties
(
console
,
nettyServerConfig
,
true
);
MixAll
.
printObjectProperties
(
console
,
nettyClientConfig
,
true
);
MixAll
.
printObjectProperties
(
console
,
messageStoreConfig
,
true
);
System
.
exit
(
0
);
}
log
=
LoggerFactory
.
getLogger
(
LoggerName
.
BROKER_LOGGER_NAME
);
MixAll
.
printObjectProperties
(
log
,
brokerConfig
);
MixAll
.
printObjectProperties
(
log
,
brokerConfig
);
MixAll
.
printObjectProperties
(
log
,
nettyServerConfig
);
MixAll
.
printObjectProperties
(
log
,
nettyServerConfig
);
MixAll
.
printObjectProperties
(
log
,
nettyClientConfig
);
MixAll
.
printObjectProperties
(
log
,
nettyClientConfig
);
...
...
common/src/main/java/org/apache/rocketmq/common/constant/LoggerName.java
浏览文件 @
36e675df
...
@@ -20,6 +20,7 @@ public class LoggerName {
...
@@ -20,6 +20,7 @@ public class LoggerName {
public
static
final
String
FILTERSRV_LOGGER_NAME
=
"RocketmqFiltersrv"
;
public
static
final
String
FILTERSRV_LOGGER_NAME
=
"RocketmqFiltersrv"
;
public
static
final
String
NAMESRV_LOGGER_NAME
=
"RocketmqNamesrv"
;
public
static
final
String
NAMESRV_LOGGER_NAME
=
"RocketmqNamesrv"
;
public
static
final
String
BROKER_LOGGER_NAME
=
"RocketmqBroker"
;
public
static
final
String
BROKER_LOGGER_NAME
=
"RocketmqBroker"
;
public
static
final
String
BROKER_CONSOLE_NAME
=
"RocketmqConsole"
;
public
static
final
String
CLIENT_LOGGER_NAME
=
"RocketmqClient"
;
public
static
final
String
CLIENT_LOGGER_NAME
=
"RocketmqClient"
;
public
static
final
String
TOOLS_LOGGER_NAME
=
"RocketmqTools"
;
public
static
final
String
TOOLS_LOGGER_NAME
=
"RocketmqTools"
;
public
static
final
String
COMMON_LOGGER_NAME
=
"RocketmqCommon"
;
public
static
final
String
COMMON_LOGGER_NAME
=
"RocketmqCommon"
;
...
...
distribution/conf/logback_broker.xml
浏览文件 @
36e675df
...
@@ -349,6 +349,11 @@
...
@@ -349,6 +349,11 @@
<appender-ref
ref=
"RocketmqFilterAppender"
/>
<appender-ref
ref=
"RocketmqFilterAppender"
/>
</logger>
</logger>
<logger
name=
"RocketmqConsole"
additivity=
"false"
>
<level
value=
"INFO"
/>
<appender-ref
ref=
"STDOUT"
/>
</logger>
<root>
<root>
<level
value=
"INFO"
/>
<level
value=
"INFO"
/>
<appender-ref
ref=
"DefaultAppender"
/>
<appender-ref
ref=
"DefaultAppender"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录