Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
myguguang
elasticsearch-analysis-ik
提交
94953157
E
elasticsearch-analysis-ik
项目概览
myguguang
/
elasticsearch-analysis-ik
与 Fork 源项目一致
从无法访问的项目Fork
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
elasticsearch-analysis-ik
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
94953157
编写于
11月 20, 2018
作者:
my03131302
提交者:
weixin_43283383
11月 20, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改适配elasticsearch 6.5.0 (#615)
Signed-off-by:
杨晓东
<
03131302@163.com
>
上级
1d750a9b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
109 addition
and
32 deletion
+109
-32
pom.xml
pom.xml
+1
-1
src/main/java/org/wltea/analyzer/dic/Dictionary.java
src/main/java/org/wltea/analyzer/dic/Dictionary.java
+2
-2
src/main/java/org/wltea/analyzer/dic/Monitor.java
src/main/java/org/wltea/analyzer/dic/Monitor.java
+2
-2
src/main/java/org/wltea/analyzer/help/ESPluginLoggerFactory.java
...n/java/org/wltea/analyzer/help/ESPluginLoggerFactory.java
+27
-0
src/main/java/org/wltea/analyzer/help/PrefixPluginLogger.java
...main/java/org/wltea/analyzer/help/PrefixPluginLogger.java
+48
-0
src/main/java/org/wltea/analyzer/help/Sleep.java
src/main/java/org/wltea/analyzer/help/Sleep.java
+29
-27
未找到文件。
pom.xml
浏览文件 @
94953157
...
...
@@ -12,7 +12,7 @@
<inceptionYear>
2011
</inceptionYear>
<properties>
<elasticsearch.version>
6.
3
.0
</elasticsearch.version>
<elasticsearch.version>
6.
5
.0
</elasticsearch.version>
<maven.compiler.target>
1.8
</maven.compiler.target>
<elasticsearch.assembly.descriptor>
${project.basedir}/src/main/assemblies/plugin.xml
</elasticsearch.assembly.descriptor>
<elasticsearch.plugin.name>
analysis-ik
</elasticsearch.plugin.name>
...
...
src/main/java/org/wltea/analyzer/dic/Dictionary.java
浏览文件 @
94953157
...
...
@@ -51,10 +51,10 @@ import org.apache.http.impl.client.CloseableHttpClient;
import
org.apache.http.impl.client.HttpClients
;
import
org.elasticsearch.SpecialPermission
;
import
org.elasticsearch.common.io.PathUtils
;
import
org.elasticsearch.common.logging.ESLoggerFactory
;
import
org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin
;
import
org.wltea.analyzer.cfg.Configuration
;
import
org.apache.logging.log4j.Logger
;
import
org.wltea.analyzer.help.ESPluginLoggerFactory
;
/**
...
...
@@ -84,7 +84,7 @@ public class Dictionary {
*/
private
Configuration
configuration
;
private
static
final
Logger
logger
=
ESLoggerFactory
.
getLogger
(
Monitor
.
class
.
getName
());
private
static
final
Logger
logger
=
ES
Plugin
LoggerFactory
.
getLogger
(
Monitor
.
class
.
getName
());
private
static
ScheduledExecutorService
pool
=
Executors
.
newScheduledThreadPool
(
1
);
...
...
src/main/java/org/wltea/analyzer/dic/Monitor.java
浏览文件 @
94953157
...
...
@@ -11,11 +11,11 @@ import org.apache.http.impl.client.CloseableHttpClient;
import
org.apache.http.impl.client.HttpClients
;
import
org.apache.logging.log4j.Logger
;
import
org.elasticsearch.SpecialPermission
;
import
org.
elasticsearch.common.logging.ES
LoggerFactory
;
import
org.
wltea.analyzer.help.ESPlugin
LoggerFactory
;
public
class
Monitor
implements
Runnable
{
private
static
final
Logger
logger
=
ESLoggerFactory
.
getLogger
(
Monitor
.
class
.
getName
());
private
static
final
Logger
logger
=
ES
Plugin
LoggerFactory
.
getLogger
(
Monitor
.
class
.
getName
());
private
static
CloseableHttpClient
httpclient
=
HttpClients
.
createDefault
();
/*
...
...
src/main/java/org/wltea/analyzer/help/ESPluginLoggerFactory.java
0 → 100644
浏览文件 @
94953157
package
org.wltea.analyzer.help
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.spi.ExtendedLogger
;
public
class
ESPluginLoggerFactory
{
private
ESPluginLoggerFactory
()
{
}
static
public
Logger
getLogger
(
String
name
)
{
return
getLogger
(
""
,
LogManager
.
getLogger
(
name
));
}
static
public
Logger
getLogger
(
String
prefix
,
String
name
)
{
return
getLogger
(
prefix
,
LogManager
.
getLogger
(
name
));
}
static
public
Logger
getLogger
(
String
prefix
,
Class
<?>
clazz
)
{
return
getLogger
(
prefix
,
LogManager
.
getLogger
(
clazz
.
getName
()));
}
static
public
Logger
getLogger
(
String
prefix
,
Logger
logger
)
{
return
(
Logger
)(
prefix
!=
null
&&
prefix
.
length
()
!=
0
?
new
PrefixPluginLogger
((
ExtendedLogger
)
logger
,
logger
.
getName
(),
prefix
)
:
logger
);
}
}
src/main/java/org/wltea/analyzer/help/PrefixPluginLogger.java
0 → 100644
浏览文件 @
94953157
package
org.wltea.analyzer.help
;
import
org.apache.logging.log4j.Level
;
import
org.apache.logging.log4j.Marker
;
import
org.apache.logging.log4j.MarkerManager
;
import
org.apache.logging.log4j.message.Message
;
import
org.apache.logging.log4j.message.MessageFactory
;
import
org.apache.logging.log4j.spi.ExtendedLogger
;
import
org.apache.logging.log4j.spi.ExtendedLoggerWrapper
;
import
java.util.WeakHashMap
;
public
class
PrefixPluginLogger
extends
ExtendedLoggerWrapper
{
private
static
final
WeakHashMap
<
String
,
Marker
>
markers
=
new
WeakHashMap
();
private
final
Marker
marker
;
static
int
markersSize
()
{
return
markers
.
size
();
}
public
String
prefix
()
{
return
this
.
marker
.
getName
();
}
PrefixPluginLogger
(
ExtendedLogger
logger
,
String
name
,
String
prefix
)
{
super
(
logger
,
name
,
(
MessageFactory
)
null
);
String
actualPrefix
=
prefix
==
null
?
""
:
prefix
;
WeakHashMap
var6
=
markers
;
MarkerManager
.
Log4jMarker
actualMarker
;
synchronized
(
markers
)
{
MarkerManager
.
Log4jMarker
maybeMarker
=
(
MarkerManager
.
Log4jMarker
)
markers
.
get
(
actualPrefix
);
if
(
maybeMarker
==
null
)
{
actualMarker
=
new
MarkerManager
.
Log4jMarker
(
actualPrefix
);
markers
.
put
(
new
String
(
actualPrefix
),
actualMarker
);
}
else
{
actualMarker
=
maybeMarker
;
}
}
this
.
marker
=
(
Marker
)
actualMarker
;
}
public
void
logMessage
(
String
fqcn
,
Level
level
,
Marker
marker
,
Message
message
,
Throwable
t
)
{
assert
marker
==
null
;
super
.
logMessage
(
fqcn
,
level
,
this
.
marker
,
message
,
t
);
}
}
\ No newline at end of file
src/main/java/org/wltea/analyzer/help/Sleep.java
浏览文件 @
94953157
package
org.wltea.analyzer.help
;
import
org.apache.logging.log4j.Logger
;
import
org.elasticsearch.common.logging.ESLoggerFactory
;
public
class
Sleep
{
private
static
final
Logger
logger
=
ESLoggerFactory
.
getLogger
(
Sleep
.
class
.
getName
());
public
enum
Type
{
MSEC
,
SEC
,
MIN
,
HOUR
};
public
static
void
sleep
(
Type
type
,
int
num
){
try
{
switch
(
type
){
case
MSEC:
Thread
.
sleep
(
num
);
return
;
case
SEC:
Thread
.
sleep
(
num
*
1000
);
return
;
case
MIN:
Thread
.
sleep
(
num
*
60
*
1000
);
return
;
case
HOUR:
Thread
.
sleep
(
num
*
60
*
60
*
1000
);
return
;
default
:
System
.
err
.
println
(
"输入类型错误,应为MSEC,SEC,MIN,HOUR之一"
);
return
;
}
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
private
static
final
Logger
logger
=
ESPluginLoggerFactory
.
getLogger
(
Sleep
.
class
.
getName
());
public
enum
Type
{
MSEC
,
SEC
,
MIN
,
HOUR
}
;
public
static
void
sleep
(
Type
type
,
int
num
)
{
try
{
switch
(
type
)
{
case
MSEC:
Thread
.
sleep
(
num
);
return
;
case
SEC:
Thread
.
sleep
(
num
*
1000
);
return
;
case
MIN:
Thread
.
sleep
(
num
*
60
*
1000
);
return
;
case
HOUR:
Thread
.
sleep
(
num
*
60
*
60
*
1000
);
return
;
default
:
System
.
err
.
println
(
"输入类型错误,应为MSEC,SEC,MIN,HOUR之一"
);
return
;
}
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录