Skip to content

Commit

Permalink
修正日志
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwpttcg66
jwpttcg66 committed May 5, 2017
1 parent 1fb3576 commit 4d79c3e
Show file tree
Hide file tree
Showing 19 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/snowcattle/game/executor/common/utils/ExecutorUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Created by jiangwenping on 17/1/11.
*/
public class ExecutorUtil {
private static final Logger logger = Loggers.gameExcutorUtil;
private static final Logger logger = Loggers.gameExecutorUtil;
/** 默认的{@link ExecutorService}关闭前等待其中的任务结束的时间:5分钟 */
private static final int DEFAULT_AWAIT_TERMINATE_MINUTES = 5;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/snowcattle/game/executor/common/utils/Loggers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*/
public class Loggers {
/** Server相关的日志 */
public static final Logger gameExcutorError = (Logger) LoggerFactory.getLogger("gameExcutorError");
public static final Logger gameExecutorError = (Logger) LoggerFactory.getLogger("gameExecutorError");
/** Server相关的日志 */
public static final Logger gameExcutorUtil = (Logger) LoggerFactory.getLogger("gameExcutorUtil");
public static final Logger gameExecutorUtil = (Logger) LoggerFactory.getLogger("gameExecutorUtil");
/** Server相关的日志 */
public static final Logger gameExcutorEvent = (Logger) LoggerFactory.getLogger("gameExcutorEvent");
public static final Logger gameExecutorEvent = (Logger) LoggerFactory.getLogger("gameExecutorEvent");
}

2 changes: 1 addition & 1 deletion src/main/java/com/snowcattle/game/executor/common/utils/SystemPropertyUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
public final class SystemPropertyUtil {

private static final Logger logger = Loggers.gameExcutorUtil;
private static final Logger logger = Loggers.gameExecutorUtil;

/**
* Returns {@code true} if and only if the system property with the specified {@code key}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/snowcattle/game/executor/event/EventBus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ public int cycle(int maxSize) {

public void handleSingleEvent(IEvent event) {

if(Loggers.gameExcutorUtil.isDebugEnabled()) {
if(Loggers.gameExecutorUtil.isDebugEnabled()) {
EventParam[] eventParams = event.getParams();
if(eventParams != null) {
if (eventParams[0].getT() instanceof IUpdate) {
IUpdate iUpdate = (IUpdate) eventParams[0].getT();
Loggers.gameExcutorUtil.debug("handle " + EventTypeEnum.values()[event.getEventType().getIndex()] + " id " + iUpdate.getId() + " dispatch");
Loggers.gameExecutorUtil.debug("handle " + EventTypeEnum.values()[event.getEventType().getIndex()] + " id " + iUpdate.getId() + " dispatch");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/snowcattle/game/executor/event/impl/event/CreateEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public CreateEvent(EventType eventType,ID eventId, EventParam... parms){
}

public void call() {
if(Loggers.gameExcutorUtil.isDebugEnabled()){
if(Loggers.gameExecutorUtil.isDebugEnabled()){
EventParam[] eventParams = getParams();
Loggers.gameExcutorUtil.debug("create event " + eventParams[0].getT());
Loggers.gameExecutorUtil.debug("create event " + eventParams[0].getT());
}

}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/snowcattle/game/executor/event/impl/event/UpdateEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public UpdateEvent(EventType eventType, ID eventId, EventParam... parms){
}

public void call() {
// if(Loggers.gameExcutorUtil.isDebugEnabled()){
// if(Loggers.gameExecutorUtil.isDebugEnabled()){
// EventParam[] eventParams = getParams();
// Loggers.gameExcutorUtil.debug("update event " + eventParams[0].getT());
// Loggers.gameExecutorUtil.debug("update event " + eventParams[0].getT());
// }
}

Expand Down
4 changes: 2 additions & 2 deletions ...in/java/com/snowcattle/game/executor/event/impl/listener/DispatchUpdateEventListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public DispatchUpdateEventListener(DispatchThread dispatchThread, UpdateService


public void fireEvent(IEvent event) {
// if(Loggers.gameExcutorUtil.isDebugEnabled()){
// Loggers.gameExcutorUtil.debug("处理update");
// if(Loggers.gameExecutorUtil.isDebugEnabled()){
// Loggers.gameExecutorUtil.debug("处理update");
// }
super.fireEvent(event);

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/snowcattle/game/executor/event/service/AsyncEventService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import com.snowcattle.game.executor.common.utils.Loggers;
import com.snowcattle.game.executor.event.EventBus;
import com.snowcattle.game.executor.event.SingleEvent;
import com.snowcattle.game.executor.event.common.IEvent;
import com.snowcattle.game.expression.Expression;
import com.snowcattle.game.expression.ExpressionUtil;
import com.snowcattle.game.thread.executor.OrderedQueuePoolExecutor;
Expand All @@ -21,7 +20,7 @@
*/
public class AsyncEventService {

private Logger eventLogger = Loggers.gameExcutorEvent;
private Logger eventLogger = Loggers.gameExecutorEvent;

private EventBus eventBus;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/snowcattle/game/executor/update/cache/StaticUpdateEventCacheFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static UpdateEvent createUpdateEvent(){
try {
return updateEventCacheFactory.borrowObject();
} catch (Exception e) {
Loggers.gameExcutorError.error(e.toString(), e);
Loggers.gameExecutorError.error(e.toString(), e);
}
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/snowcattle/game/executor/update/pool/excutor/BindThreadUpdateExecutorService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public BindThreadUpdateExecutorService(int updateExcutorIndex, DispatchThread di
new LinkedBlockingQueue<Runnable>(), new ThreadNameFactory("bind-thread-update")));
this.updateExcutorIndex = updateExcutorIndex;
updateQueue = new ConcurrentLinkedQueue<IUpdate>();
fetchUpdates = new LinkedBlockingQueue<IUpdate>(Short.MAX_VALUE);
fetchUpdates = new LinkedBlockingQueue<IUpdate>(Integer.MAX_VALUE);
this.dispatchThread = dispatchThread;
}

Expand All @@ -63,7 +63,7 @@ public void wakeUp(){
try {
fetchUpdates.put(nullWeakUpUpdate);
} catch (InterruptedException e) {
Loggers.gameExcutorError.error(e.toString(), e);
Loggers.gameExecutorError.error(e.toString(), e);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/snowcattle/game/executor/update/service/UpdateService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public void addReadyCreateEvent(CycleEvent event){
IUpdate iUpdate = (IUpdate) eventParams[0].getT();
updateMap.put((ID) event.getId(), iUpdate);
//通知dispatchThread
if(Loggers.gameExcutorUtil.isDebugEnabled()) {
Loggers.gameExcutorUtil.debug("readycreate " + iUpdate.getId() + " dispatch");
if(Loggers.gameExecutorUtil.isDebugEnabled()) {
Loggers.gameExecutorUtil.debug("readycreate " + iUpdate.getId() + " dispatch");
}
CreateEvent createEvent = new CreateEvent(Constants.EventTypeConstans.createEventType, event.getId(), eventParams);
dispatchThread.addCreateEvent(createEvent);
Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/com/snowcattle/game/executor/update/thread/dispatch/DisruptorDispatchThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void putEvent(IEvent event){
blockingQueue.put(event);
total.getAndIncrement();
} catch (InterruptedException e) {
Loggers.gameExcutorError.error(e.toString(), e);
Loggers.gameExecutorError.error(e.toString(), e);
}
}
@Override
Expand Down Expand Up @@ -106,7 +106,7 @@ public void run(){
cycleEvent = (CycleEvent) blockingQueue.take();
dispatch(cycleEvent);
} catch (InterruptedException e) {
Loggers.gameExcutorError.error(e.toString(), e);
Loggers.gameExecutorError.error(e.toString(), e);
}
i++;
}
Expand All @@ -124,7 +124,7 @@ public void checkSleep(long startTime){
try {
Thread.currentThread().sleep(cycleSleepTime, (int) (diff % 999999));
} catch (Throwable e) {
Loggers.gameExcutorUtil.error(e.toString(), e);
Loggers.gameExecutorUtil.error(e.toString(), e);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/snowcattle/game/executor/update/thread/dispatch/LockSupportDisptachThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void checkSleep(long startTime){
try {
Thread.currentThread().sleep(cycleSleepTime, (int) (diff % 999999));
} catch (Throwable e) {
Loggers.gameExcutorUtil.error(e.toString(), e);
Loggers.gameExecutorUtil.error(e.toString(), e);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions .../com/snowcattle/game/executor/update/thread/listener/LockSupportUpdateFutureListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ public class LockSupportUpdateFutureListener implements ITaskFutureListener {

@Override
public void operationComplete(ITaskFuture iTaskFuture) throws Exception {
if(Loggers.gameExcutorUtil.isDebugEnabled()){
if(Loggers.gameExecutorUtil.isDebugEnabled()){
IUpdate iUpdate = (IUpdate) iTaskFuture.get();
Loggers.gameExcutorUtil.debug("update complete event id " + iUpdate.getId());
Loggers.gameExecutorUtil.debug("update complete event id " + iUpdate.getId());
}
LockSupportUpdateFuture lockSupportUpdateFuture = (LockSupportUpdateFuture) iTaskFuture;
IUpdate iUpdate = (IUpdate) iTaskFuture.get();
Expand Down
8 changes: 4 additions & 4 deletions ...main/java/com/snowcattle/game/executor/update/thread/update/bind/BindingUpdateThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void run() {
break;
}
} catch (Exception e) {
Loggers.gameExcutorError.error(e.toString(), e);
Loggers.gameExecutorError.error(e.toString(), e);
break;
}

Expand All @@ -76,7 +76,7 @@ public void run() {
try {
fetchUpdates.take();
} catch (InterruptedException e) {
Loggers.gameExcutorError.error(e.toString(), e);
Loggers.gameExecutorError.error(e.toString(), e);
}
}

Expand Down Expand Up @@ -116,8 +116,8 @@ public void sendFinishList(){

//事件总线增加更新完成通知
for(IUpdate excutorUpdate : finishList){
// if(Loggers.gameExcutorUtil.isDebugEnabled()) {
// Loggers.gameExcutorUtil.debug(executorUpdate.getId() + "发送存活" + executorUpdate.isActive());
// if(Loggers.gameExecutorUtil.isDebugEnabled()) {
// Loggers.gameExecutorUtil.debug(executorUpdate.getId() + "发送存活" + executorUpdate.isActive());
// }
sendFinish(excutorUpdate);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/log4j.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ log4j.appender.error.File=logs/error.log
log4j.appender.error.layout=org.apache.log4j.PatternLayout
log4j.appender.error.layout.ConversionPattern=%d{HH:mm:ss,SSS} - %C{1}.%M - %m%n

#--------------------gameExcutorUtil--------------------------------
#--------------------gameExecutorUtil--------------------------------
log4j.appender.gameExcutorUtil=org.apache.log4j.DailyRollingFileAppender
log4j.appender.gameExcutorUtil.encoding=UTF-8
log4j.appender.gameExcutorUtil.append=true
Expand All @@ -27,7 +27,7 @@ log4j.appender.gameExcutorUtil.File=logs/util.log
log4j.appender.gameExcutorUtil.layout=org.apache.log4j.PatternLayout
log4j.appender.gameExcutorUtil.layout.ConversionPattern=%d{HH:mm:ss} - %m%n

#--------------------gameExcutorError--------------------------------
#--------------------gameExecutorError--------------------------------
log4j.appender.gameExcutorError=org.apache.log4j.DailyRollingFileAppender
log4j.appender.gameExcutorError.encoding=UTF-8
log4j.appender.gameExcutorError.append=true
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/snowcattle/game/executor/update/async/IntegerUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public void update() {
long useTime = endTime - startTime;
System.out.println("耗时" + useTime + "id" + getId());
}
if (Loggers.gameExcutorUtil.isDebugEnabled()) {
Loggers.gameExcutorUtil.debug("update id " + getId() + " incrId:" + incrId);
if (Loggers.gameExecutorUtil.isDebugEnabled()) {
Loggers.gameExecutorUtil.debug("update id " + getId() + " incrId:" + incrId);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/snowcattle/game/executor/update/asyncnotify/AsyncNotifyUpdateTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static void testUpdate() throws Exception {
EventBus updateEventBus = new EventBus();
// int maxSize = 10000;
// int corePoolSize = 100;
int maxSize = 20000;
int maxSize = 3000;
int corePoolSize = 10;
long keepAliveTime = 60;
TimeUnit timeUnit = TimeUnit.SECONDS;
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/log4j.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ log4j.appender.error.File=logs/error.log
log4j.appender.error.layout=org.apache.log4j.PatternLayout
log4j.appender.error.layout.ConversionPattern=%d{HH:mm:ss,SSS} - %C{1}.%M - %m%n

#--------------------gameExcutorUtil--------------------------------
#--------------------gameExecutorUtil--------------------------------
log4j.appender.gameExcutorUtil=org.apache.log4j.DailyRollingFileAppender
log4j.appender.gameExcutorUtil.encoding=UTF-8
log4j.appender.gameExcutorUtil.append=true
Expand All @@ -27,7 +27,7 @@ log4j.appender.gameExcutorUtil.File=logs/util.log
log4j.appender.gameExcutorUtil.layout=org.apache.log4j.PatternLayout
log4j.appender.gameExcutorUtil.layout.ConversionPattern=%d{HH:mm:ss} - %m%n

#--------------------gameExcutorError--------------------------------
#--------------------gameExecutorError--------------------------------
log4j.appender.gameExcutorError=org.apache.log4j.DailyRollingFileAppender
log4j.appender.gameExcutorError.encoding=UTF-8
log4j.appender.gameExcutorError.append=true
Expand Down

0 comments on commit 4d79c3e

Please sign in to comment.