장동신
2024-10-14
전송큐 pushQueue 메소드 시그니처 수정
@011366d31bcda7a3949b875047ff9c96fcf26e87
--- src/main/java/com/munjaon/server/queue/enums/QueueTypeWorker.java
+++ src/main/java/com/munjaon/server/queue/enums/QueueTypeWorker.java
... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 |
} |
| 37 | 37 |
|
| 38 | 38 |
@Override |
| 39 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 39 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 40 | 40 |
SmsQueueService smsQueueService = (SmsQueueService) QueueService.SMS_QUEUE_SERVICE.getService(); |
| 41 | 41 |
smsQueueService.pushQueue(data); |
| 42 | 42 |
} |
... | ... | @@ -103,7 +103,7 @@ |
| 103 | 103 |
} |
| 104 | 104 |
|
| 105 | 105 |
@Override |
| 106 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 106 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 107 | 107 |
LmsQueueService lmsQueueService = (LmsQueueService) QueueService.LMS_QUEUE_SERVICE.getService(); |
| 108 | 108 |
lmsQueueService.pushQueue(data); |
| 109 | 109 |
} |
... | ... | @@ -170,7 +170,7 @@ |
| 170 | 170 |
} |
| 171 | 171 |
|
| 172 | 172 |
@Override |
| 173 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 173 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 174 | 174 |
MmsQueueService mmsQueueService = (MmsQueueService) QueueService.MMS_QUEUE_SERVICE.getService(); |
| 175 | 175 |
mmsQueueService.pushQueue(data); |
| 176 | 176 |
} |
... | ... | @@ -237,7 +237,7 @@ |
| 237 | 237 |
} |
| 238 | 238 |
|
| 239 | 239 |
@Override |
| 240 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 240 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 241 | 241 |
KakaoAlarmQueueService kakaoAlarmQueueService = (KakaoAlarmQueueService) QueueService.KAT_QUEUE_SERVICE.getService(); |
| 242 | 242 |
kakaoAlarmQueueService.pushQueue(data); |
| 243 | 243 |
} |
... | ... | @@ -304,7 +304,7 @@ |
| 304 | 304 |
} |
| 305 | 305 |
|
| 306 | 306 |
@Override |
| 307 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 307 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 308 | 308 |
KakaoFriendQueueService kakaoFriendQueueService = (KakaoFriendQueueService) QueueService.KFT_QUEUE_SERVICE.getService(); |
| 309 | 309 |
kakaoFriendQueueService.pushQueue(data); |
| 310 | 310 |
} |
... | ... | @@ -366,7 +366,7 @@ |
| 366 | 366 |
public abstract boolean isExistQueue(String name); |
| 367 | 367 |
public abstract void removeQueue(String name); |
| 368 | 368 |
public abstract void addQueue(WriteQueue queue); |
| 369 |
- public abstract void pushQueue(BasicMessageDto data); |
|
| 369 |
+ public abstract void pushQueue(BasicMessageDto data) throws Exception; |
|
| 370 | 370 |
public abstract int saveMessageToTable(BasicMessageDto data); |
| 371 | 371 |
public abstract int saveMessageForList(List<BasicMessageDto> list); |
| 372 | 372 |
|
--- src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java
+++ src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java
... | ... | @@ -43,7 +43,11 @@ |
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
@Override |
| 46 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 46 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 47 |
+ queueInstance.pushQueue(data); |
|
| 48 |
+ } |
|
| 49 |
+ |
|
| 50 |
+ public void pushQueue_bak(BasicMessageDto data) {
|
|
| 47 | 51 |
boolean isError = false; |
| 48 | 52 |
try {
|
| 49 | 53 |
queueInstance.pushQueue(data); |
--- src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java
+++ src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java
... | ... | @@ -43,7 +43,11 @@ |
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
@Override |
| 46 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 46 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 47 |
+ queueInstance.pushQueue(data); |
|
| 48 |
+ } |
|
| 49 |
+ |
|
| 50 |
+ public void pushQueue_bak(BasicMessageDto data) {
|
|
| 47 | 51 |
boolean isError = false; |
| 48 | 52 |
try {
|
| 49 | 53 |
queueInstance.pushQueue(data); |
--- src/main/java/com/munjaon/server/queue/service/LmsQueueService.java
+++ src/main/java/com/munjaon/server/queue/service/LmsQueueService.java
... | ... | @@ -43,7 +43,11 @@ |
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
@Override |
| 46 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 46 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 47 |
+ queueInstance.pushQueue(data); |
|
| 48 |
+ } |
|
| 49 |
+ |
|
| 50 |
+ public void pushQueue_bak(BasicMessageDto data) {
|
|
| 47 | 51 |
boolean isError = false; |
| 48 | 52 |
try {
|
| 49 | 53 |
queueInstance.pushQueue(data); |
--- src/main/java/com/munjaon/server/queue/service/MmsQueueService.java
+++ src/main/java/com/munjaon/server/queue/service/MmsQueueService.java
... | ... | @@ -43,7 +43,11 @@ |
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
@Override |
| 46 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 46 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 47 |
+ queueInstance.pushQueue(data); |
|
| 48 |
+ } |
|
| 49 |
+ |
|
| 50 |
+ public void pushQueue_bak(BasicMessageDto data) {
|
|
| 47 | 51 |
boolean isError = false; |
| 48 | 52 |
try {
|
| 49 | 53 |
queueInstance.pushQueue(data); |
--- src/main/java/com/munjaon/server/queue/service/QueueAction.java
+++ src/main/java/com/munjaon/server/queue/service/QueueAction.java
... | ... | @@ -10,7 +10,7 @@ |
| 10 | 10 |
boolean isExistQueue(String name); |
| 11 | 11 |
void removeQueue(String name); |
| 12 | 12 |
void addQueue(WriteQueue queue); |
| 13 |
- void pushQueue(BasicMessageDto data); |
|
| 13 |
+ void pushQueue(BasicMessageDto data) throws Exception; |
|
| 14 | 14 |
int saveMessageToTable(BasicMessageDto data); |
| 15 | 15 |
int saveMessageForList(List<BasicMessageDto> list); |
| 16 | 16 |
|
--- src/main/java/com/munjaon/server/queue/service/SmsQueueService.java
+++ src/main/java/com/munjaon/server/queue/service/SmsQueueService.java
... | ... | @@ -43,7 +43,11 @@ |
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
@Override |
| 46 |
- public void pushQueue(BasicMessageDto data) {
|
|
| 46 |
+ public void pushQueue(BasicMessageDto data) throws Exception {
|
|
| 47 |
+ queueInstance.pushQueue(data); |
|
| 48 |
+ } |
|
| 49 |
+ |
|
| 50 |
+ public void pushQueue_bak(BasicMessageDto data) {
|
|
| 47 | 51 |
boolean isError = false; |
| 48 | 52 |
try {
|
| 49 | 53 |
queueInstance.pushQueue(data); |
--- src/main/java/com/munjaon/server/server/service/CollectBackServerService.java
+++ src/main/java/com/munjaon/server/server/service/CollectBackServerService.java
... | ... | @@ -296,7 +296,7 @@ |
| 296 | 296 |
} |
| 297 | 297 |
} |
| 298 | 298 |
|
| 299 |
- private void recvDeliver(SocketChannel channel, ByteBuffer buffer, ConnectUserDto userDto) throws IOException {
|
|
| 299 |
+ private void recvDeliver(SocketChannel channel, ByteBuffer buffer, ConnectUserDto userDto) throws Exception {
|
|
| 300 | 300 |
BasicMessageDto messageDto = new BasicMessageDto(); |
| 301 | 301 |
messageDto.setRouterSeq("40");
|
| 302 | 302 |
messageDto.setServiceType("4");
|
--- src/main/java/com/munjaon/server/server/service/CollectServer.java
+++ src/main/java/com/munjaon/server/server/service/CollectServer.java
... | ... | @@ -115,7 +115,7 @@ |
| 115 | 115 |
|
| 116 | 116 |
if (key.isValid()) {
|
| 117 | 117 |
if (key.isAcceptable()) { // 접속일 경우..
|
| 118 |
- saveSystemLog("CONNECTION IS ACCEPTABLE ... ...");
|
|
| 118 |
+ saveLog("CONNECTION IS ACCEPTABLE ... ...");
|
|
| 119 | 119 |
accept(selector, key); |
| 120 | 120 |
} else if (key.isReadable()) { // 수신일 경우..
|
| 121 | 121 |
ConnectUserDto connectUserDto = (ConnectUserDto) key.attachment(); |
... | ... | @@ -171,11 +171,11 @@ |
| 171 | 171 |
/* 소켓 취득 */ |
| 172 | 172 |
Socket socket = channel.socket(); |
| 173 | 173 |
InetAddress inetAddress = socket.getInetAddress(); |
| 174 |
- saveSystemLog("[CLIENT CONNECTION IP : " + inetAddress.getHostAddress() + "]");
|
|
| 174 |
+ saveLog("[CLIENT CONNECTION IP : " + inetAddress.getHostAddress() + "]");
|
|
| 175 | 175 |
// Socket 채널을 channel에 수신 등록한다 |
| 176 | 176 |
channel.register(selector, SelectionKey.OP_READ, ConnectUserDto.builder().serviceType(this.serviceType).lastTrafficTime(System.currentTimeMillis()).remoteIP(inetAddress.getHostAddress()).build()); |
| 177 | 177 |
} catch (Exception e) {
|
| 178 |
- saveSystemLog(e.toString()); |
|
| 178 |
+ saveLog(e.toString()); |
|
| 179 | 179 |
throw new RuntimeException(e); |
| 180 | 180 |
} |
| 181 | 181 |
} |
... | ... | @@ -188,7 +188,7 @@ |
| 188 | 188 |
SocketChannel channel = (SocketChannel) key.channel(); |
| 189 | 189 |
ConnectUserDto userDto = (ConnectUserDto) key.attachment(); |
| 190 | 190 |
if (userDto != null && userDto.getUserId() != null) {
|
| 191 |
- saveSystemLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]");
|
|
| 191 |
+ saveLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]");
|
|
| 192 | 192 |
collectUserQueue.removeUser(this.serviceType, userDto.getUserId()); |
| 193 | 193 |
key.attach(null); |
| 194 | 194 |
/* 모니터링 로그 */ |
... | ... | @@ -199,7 +199,7 @@ |
| 199 | 199 |
// 키 닫기 |
| 200 | 200 |
key.cancel(); |
| 201 | 201 |
} catch (IOException e) {
|
| 202 |
- saveSystemLog(e.toString()); |
|
| 202 |
+ saveLog(e.toString()); |
|
| 203 | 203 |
e.printStackTrace(); |
| 204 | 204 |
} |
| 205 | 205 |
} |
--- src/main/java/com/munjaon/server/server/service/HealthCheckServer.java
+++ src/main/java/com/munjaon/server/server/service/HealthCheckServer.java
... | ... | @@ -102,7 +102,7 @@ |
| 102 | 102 |
break; |
| 103 | 103 |
} |
| 104 | 104 |
|
| 105 |
- saveSystemLog(msg); |
|
| 105 |
+ saveLog(msg); |
|
| 106 | 106 |
if ("Y".equals(slackYn)) {
|
| 107 | 107 |
JSONObject payload = new JSONObject(); |
| 108 | 108 |
payload.put("text", msg);
|
... | ... | @@ -200,8 +200,8 @@ |
| 200 | 200 |
} |
| 201 | 201 |
} |
| 202 | 202 |
} catch (IOException e) {
|
| 203 |
- saveSystemLog("Connect Fail to [PORT : " + port + "]");
|
|
| 204 |
- saveSystemLog("ERROR [" + e.getMessage() + "]");
|
|
| 203 |
+ saveLog("Connect Fail to [PORT : " + port + "]");
|
|
| 204 |
+ saveLog("ERROR [" + e.getMessage() + "]");
|
|
| 205 | 205 |
} finally {
|
| 206 | 206 |
if (socketChannel != null) {
|
| 207 | 207 |
try {
|
--- src/main/java/com/munjaon/server/server/service/QueueServerService.java
+++ src/main/java/com/munjaon/server/server/service/QueueServerService.java
... | ... | @@ -76,12 +76,16 @@ |
| 76 | 76 |
writeQueue.initQueue(); |
| 77 | 77 |
/* 읽기 큐 */ |
| 78 | 78 |
readQueue.initQueue(); |
| 79 |
+ /* 최초 큐정보 */ |
|
| 80 |
+ saveSystemLog("[INIT_LOAD_BEFORE][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
|
|
| 79 | 81 |
/* 큐 초기화 */ |
| 80 | 82 |
initQueue(); |
| 81 | 83 |
/* 큐 pool에 등록 */ |
| 82 | 84 |
worker.addQueue(writeQueue); |
| 83 | 85 |
/* 메모리큐에서 다시 적재하기 */ |
| 84 | 86 |
loadMemoryQueue(); |
| 87 |
+ /* 최종 큐정보 */ |
|
| 88 |
+ saveSystemLog("[INIT_LOAD_AFTER][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
|
|
| 85 | 89 |
} |
| 86 | 90 |
} catch (Exception e) {
|
| 87 | 91 |
saveSystemLog(e.toString()); |
... | ... | @@ -171,6 +175,7 @@ |
| 171 | 175 |
isQueueInit = true; |
| 172 | 176 |
} |
| 173 | 177 |
if (isQueueInit) {
|
| 178 |
+ saveSystemLog("[QUEUE_INIT_START][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
|
|
| 174 | 179 |
/* 큐 백업 */ |
| 175 | 180 |
writeQueue.backupQueue(); |
| 176 | 181 |
/* 커밋 카운트 초기화 */ |
... | ... | @@ -182,6 +187,8 @@ |
| 182 | 187 |
worker.addQueue(writeQueue); |
| 183 | 188 |
/* 메모리큐에서 다시 적재하기 */ |
| 184 | 189 |
loadMemoryQueue(); |
| 190 |
+ |
|
| 191 |
+ saveSystemLog("[QUEUE_INIT_END][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
|
|
| 185 | 192 |
} |
| 186 | 193 |
} |
| 187 | 194 |
|
... | ... | @@ -241,6 +248,8 @@ |
| 241 | 248 |
worker.removeQueue(writeQueue.getQueueInfo().getQueueName()); |
| 242 | 249 |
/* 자원 해제 */ |
| 243 | 250 |
writeQueue.close(); |
| 251 |
+ |
|
| 252 |
+ saveSystemLog("[QUEUE_RELEASE][QUEUE_NAME : " + writeQueue.getQueueName() + "]");
|
|
| 244 | 253 |
} |
| 245 | 254 |
|
| 246 | 255 |
if (readQueue != null) {
|
--- src/main/java/com/munjaon/server/server/service/ReportServer.java
+++ src/main/java/com/munjaon/server/server/service/ReportServer.java
... | ... | @@ -185,7 +185,7 @@ |
| 185 | 185 |
|
| 186 | 186 |
if (key.isValid()) {
|
| 187 | 187 |
if (key.isAcceptable()) { // 접속일 경우..
|
| 188 |
- saveSystemLog("CONNECTION IS ACCEPTABLE ... ...");
|
|
| 188 |
+ saveLog("CONNECTION IS ACCEPTABLE ... ...");
|
|
| 189 | 189 |
accept(selector, key); |
| 190 | 190 |
} else if (key.isReadable()) { // 수신일 경우..
|
| 191 | 191 |
ReportUserDto reportUserDto = (ReportUserDto) key.attachment(); |
... | ... | @@ -218,7 +218,7 @@ |
| 218 | 218 |
|
| 219 | 219 |
if (key.isValid()) {
|
| 220 | 220 |
if (key.isAcceptable()) { // 접속일 경우..
|
| 221 |
- saveSystemLog("CONNECTION IS ACCEPTABLE ... ...");
|
|
| 221 |
+ saveLog("CONNECTION IS ACCEPTABLE ... ...");
|
|
| 222 | 222 |
accept(selector, key); |
| 223 | 223 |
} else if (key.isReadable()) { // 수신일 경우..
|
| 224 | 224 |
ReportUserDto reportUserDto = (ReportUserDto) key.attachment(); |
... | ... | @@ -245,11 +245,11 @@ |
| 245 | 245 |
/* 소켓 취득 */ |
| 246 | 246 |
Socket socket = channel.socket(); |
| 247 | 247 |
SocketAddress remoteAddr = socket.getRemoteSocketAddress(); |
| 248 |
- saveSystemLog("Connected to: " + remoteAddr);
|
|
| 248 |
+ saveLog("Connected to: " + remoteAddr);
|
|
| 249 | 249 |
// Socket 채널을 channel에 수신 등록한다 |
| 250 | 250 |
channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + getProp("QUEUE_PATH")).build());
|
| 251 | 251 |
} catch (Exception e) {
|
| 252 |
- saveSystemLog(e.toString()); |
|
| 252 |
+ saveLog(e.toString()); |
|
| 253 | 253 |
throw new RuntimeException(e); |
| 254 | 254 |
} |
| 255 | 255 |
} |
... | ... | @@ -261,7 +261,7 @@ |
| 261 | 261 |
try {
|
| 262 | 262 |
SocketChannel channel = (SocketChannel) key.channel(); |
| 263 | 263 |
ReportUserDto userDto = (ReportUserDto) key.attachment(); |
| 264 |
- saveSystemLog("Expire connect user: " + userDto);
|
|
| 264 |
+ saveLog("Expire connect user: " + userDto);
|
|
| 265 | 265 |
if (userDto != null && userDto.getUserId() != null) {
|
| 266 | 266 |
reportUserQueue.removeUser(userDto.getUserId()); |
| 267 | 267 |
// connectUserMap.remove(userDto.getUserId()); |
... | ... | @@ -274,7 +274,7 @@ |
| 274 | 274 |
// 키 닫기 |
| 275 | 275 |
key.cancel(); |
| 276 | 276 |
} catch (IOException e) {
|
| 277 |
- saveSystemLog(e.toString()); |
|
| 277 |
+ saveLog(e.toString()); |
|
| 278 | 278 |
e.printStackTrace(); |
| 279 | 279 |
} |
| 280 | 280 |
} |
--- src/main/java/com/munjaon/server/server/task/CollectReadTask.java
+++ src/main/java/com/munjaon/server/server/task/CollectReadTask.java
... | ... | @@ -178,7 +178,7 @@ |
| 178 | 178 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice())); |
| 179 | 179 |
} |
| 180 | 180 |
|
| 181 |
- saveSystemLog("[SMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 181 |
+ saveLog("[SMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 182 | 182 |
QueueTypeWorker worker = QueueTypeWorker.find("SMS");
|
| 183 | 183 |
if (worker != null) {
|
| 184 | 184 |
worker.pushQueue(messageDto); |
... | ... | @@ -210,7 +210,7 @@ |
| 210 | 210 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice())); |
| 211 | 211 |
} |
| 212 | 212 |
|
| 213 |
- saveSystemLog("[LMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 213 |
+ saveLog("[LMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 214 | 214 |
QueueTypeWorker worker = QueueTypeWorker.find("LMS");
|
| 215 | 215 |
if (worker != null) {
|
| 216 | 216 |
worker.pushQueue(messageDto); |
... | ... | @@ -258,7 +258,7 @@ |
| 258 | 258 |
} else if (i == 2) {
|
| 259 | 259 |
messageDto.setUserFileName03(imagePath + File.separator + fileName); |
| 260 | 260 |
} |
| 261 |
- saveSystemLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 261 |
+ saveLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 262 | 262 |
} |
| 263 | 263 |
|
| 264 | 264 |
/* 사용자 단가, 발송망 설정 */ |
... | ... | @@ -279,7 +279,7 @@ |
| 279 | 279 |
messageDto.setUnitCost(String.valueOf(mmsPrice)); |
| 280 | 280 |
} |
| 281 | 281 |
|
| 282 |
- saveSystemLog("[MMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 282 |
+ saveLog("[MMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 283 | 283 |
QueueTypeWorker worker = QueueTypeWorker.find("MMS");
|
| 284 | 284 |
if (worker != null) {
|
| 285 | 285 |
worker.pushQueue(messageDto); |
... | ... | @@ -319,7 +319,7 @@ |
| 319 | 319 |
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); |
| 320 | 320 |
|
| 321 | 321 |
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); |
| 322 |
- saveSystemLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 322 |
+ saveLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 323 | 323 |
|
| 324 | 324 |
/* 사용자 단가, 발송망 설정 */ |
| 325 | 325 |
MemberDto savedMemberDto = null; |
... | ... | @@ -331,13 +331,13 @@ |
| 331 | 331 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice())); |
| 332 | 332 |
} |
| 333 | 333 |
|
| 334 |
- saveSystemLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 334 |
+ saveLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 335 | 335 |
QueueTypeWorker worker = QueueTypeWorker.find("KAT");
|
| 336 | 336 |
if (worker != null) {
|
| 337 | 337 |
worker.pushQueue(messageDto); |
| 338 | 338 |
channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus())); |
| 339 | 339 |
} else {
|
| 340 |
- saveSystemLog("worker is null");
|
|
| 340 |
+ saveLog("worker is null");
|
|
| 341 | 341 |
} |
| 342 | 342 |
} catch (Exception e) {
|
| 343 | 343 |
e.printStackTrace(); |
... | ... | @@ -373,7 +373,7 @@ |
| 373 | 373 |
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); |
| 374 | 374 |
|
| 375 | 375 |
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); |
| 376 |
- saveSystemLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 376 |
+ saveLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 377 | 377 |
|
| 378 | 378 |
/* 사용자 단가, 발송망 설정 */ |
| 379 | 379 |
MemberDto savedMemberDto = null; |
... | ... | @@ -385,7 +385,7 @@ |
| 385 | 385 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice())); |
| 386 | 386 |
} |
| 387 | 387 |
|
| 388 |
- saveSystemLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 388 |
+ saveLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 389 | 389 |
QueueTypeWorker worker = QueueTypeWorker.find("KFT");
|
| 390 | 390 |
if (worker != null) {
|
| 391 | 391 |
worker.pushQueue(messageDto); |
... | ... | @@ -424,7 +424,7 @@ |
| 424 | 424 |
if (svc != null) {
|
| 425 | 425 |
memberDto = svc.get(id); |
| 426 | 426 |
} |
| 427 |
- saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 427 |
+ saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 428 | 428 |
/* Bind Check */ |
| 429 | 429 |
resultCode = checkBind(memberDto, this.serviceType, id, pwd); |
| 430 | 430 |
|
... | ... | @@ -432,9 +432,9 @@ |
| 432 | 432 |
if ("00".equals(resultCode)) {
|
| 433 | 433 |
boolean isPermit = false; |
| 434 | 434 |
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
|
| 435 |
- saveSystemLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP());
|
|
| 436 |
- saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
|
|
| 437 |
- saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
|
|
| 435 |
+ saveLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP());
|
|
| 436 |
+ saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
|
|
| 437 |
+ saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
|
|
| 438 | 438 |
if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
|
| 439 | 439 |
isPermit = true; |
| 440 | 440 |
} |
... | ... | @@ -465,7 +465,7 @@ |
| 465 | 465 |
} |
| 466 | 466 |
|
| 467 | 467 |
try {
|
| 468 |
- saveSystemLog("[BIND RESULT : " + resultCode + "]");
|
|
| 468 |
+ saveLog("[BIND RESULT : " + resultCode + "]");
|
|
| 469 | 469 |
channel.write(Bind.makeBindAckBuffer(resultCode)); |
| 470 | 470 |
if ("00".equals(resultCode) == false) {
|
| 471 | 471 |
expireConnectUser(); |
--- src/main/java/com/munjaon/server/server/task/CollectServerTask.java
+++ src/main/java/com/munjaon/server/server/task/CollectServerTask.java
... | ... | @@ -58,9 +58,9 @@ |
| 58 | 58 |
this.serviceType = serviceType; |
| 59 | 59 |
this.logger = logger; |
| 60 | 60 |
if (connectUserDto.isLogin()) {
|
| 61 |
- saveSystemLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]");
|
|
| 61 |
+ saveLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]");
|
|
| 62 | 62 |
} else {
|
| 63 |
- saveSystemLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
|
|
| 63 |
+ saveLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
|
|
| 64 | 64 |
} |
| 65 | 65 |
} |
| 66 | 66 |
|
... | ... | @@ -120,7 +120,7 @@ |
| 120 | 120 |
|
| 121 | 121 |
@Override |
| 122 | 122 |
public void run() {
|
| 123 |
- saveSystemLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); |
|
| 123 |
+ saveLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); |
|
| 124 | 124 |
/* 0. 최초 RUN Flag 체크 */ |
| 125 | 125 |
reloadRunFlag(); |
| 126 | 126 |
/* BIND 체크 및 처리 */ |
... | ... | @@ -132,9 +132,9 @@ |
| 132 | 132 |
try {
|
| 133 | 133 |
/* 2. Packet Timeout Check */ |
| 134 | 134 |
if (checkTimeOut()) {
|
| 135 |
- saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); |
|
| 135 |
+ saveLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); |
|
| 136 | 136 |
expireConnectUser(); |
| 137 |
- saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 137 |
+ saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 138 | 138 |
break; |
| 139 | 139 |
} |
| 140 | 140 |
/* 3. HeadBuffer 읽기 */ |
... | ... | @@ -160,7 +160,7 @@ |
| 160 | 160 |
/* 세션 만료 여부 */ |
| 161 | 161 |
this.isExpiredYn = true; |
| 162 | 162 |
this.IS_ERROR = true; |
| 163 |
- saveSystemLog(e); |
|
| 163 |
+ saveLog(e); |
|
| 164 | 164 |
} |
| 165 | 165 |
/* RUN Flag 체크 */ |
| 166 | 166 |
reloadRunFlag(); |
... | ... | @@ -171,7 +171,7 @@ |
| 171 | 171 |
if (IS_ERROR) {
|
| 172 | 172 |
expireConnectUser(); |
| 173 | 173 |
} |
| 174 |
- saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 174 |
+ saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 175 | 175 |
} |
| 176 | 176 |
|
| 177 | 177 |
private boolean checkTimeOut() {
|
... | ... | @@ -186,7 +186,7 @@ |
| 186 | 186 |
/* 서비스 중지여부 체크 */ |
| 187 | 187 |
if (isExpireService()) {
|
| 188 | 188 |
expireConnectUser(); |
| 189 |
- saveSystemLog(printTaskLog() + "[isExpireService : Expired ... ... ... ... ... ... ...]"); |
|
| 189 |
+ saveLog(printTaskLog() + "[isExpireService : Expired ... ... ... ... ... ... ...]"); |
|
| 190 | 190 |
return; |
| 191 | 191 |
} |
| 192 | 192 |
switch (this.serviceType) {
|
... | ... | @@ -357,7 +357,7 @@ |
| 357 | 357 |
} else if (i == 2) {
|
| 358 | 358 |
messageDto.setUserFileName03(imagePath + File.separator + fileName); |
| 359 | 359 |
} |
| 360 |
- saveSystemLog(printTaskLog() + "[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); |
|
| 360 |
+ saveLog(printTaskLog() + "[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); |
|
| 361 | 361 |
} |
| 362 | 362 |
|
| 363 | 363 |
/* 사용자 단가, 발송망 설정 */ |
... | ... | @@ -419,7 +419,7 @@ |
| 419 | 419 |
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); |
| 420 | 420 |
|
| 421 | 421 |
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); |
| 422 |
- saveSystemLog(printTaskLog() + "[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); |
|
| 422 |
+ saveLog(printTaskLog() + "[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); |
|
| 423 | 423 |
|
| 424 | 424 |
/* 사용자 단가, 발송망 설정 */ |
| 425 | 425 |
MemberDto savedMemberDto = null; |
... | ... | @@ -474,7 +474,7 @@ |
| 474 | 474 |
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); |
| 475 | 475 |
|
| 476 | 476 |
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); |
| 477 |
- saveSystemLog(printTaskLog() + "[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); |
|
| 477 |
+ saveLog(printTaskLog() + "[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); |
|
| 478 | 478 |
|
| 479 | 479 |
/* 사용자 단가, 발송망 설정 */ |
| 480 | 480 |
MemberDto savedMemberDto = null; |
... | ... | @@ -506,9 +506,9 @@ |
| 506 | 506 |
} |
| 507 | 507 |
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); |
| 508 | 508 |
channel.read(bodyBuffer); |
| 509 |
- saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]"); |
|
| 509 |
+ saveLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]"); |
|
| 510 | 510 |
channel.write(LinkCheck.makeLinkCheckAckBuffer()); |
| 511 |
- saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]"); |
|
| 511 |
+ saveLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]"); |
|
| 512 | 512 |
connectUserDto.updateLastTrafficTime(); |
| 513 | 513 |
} |
| 514 | 514 |
|
... | ... | @@ -522,7 +522,7 @@ |
| 522 | 522 |
|
| 523 | 523 |
String id = Bind.getBindId(bindBuffer); |
| 524 | 524 |
String pwd = Bind.getBindPwd(bindBuffer); |
| 525 |
- saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); |
|
| 525 |
+ saveLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); |
|
| 526 | 526 |
|
| 527 | 527 |
MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService(); |
| 528 | 528 |
MemberDto memberDto = null; |
... | ... | @@ -537,9 +537,9 @@ |
| 537 | 537 |
if ("00".equals(resultCode)) {
|
| 538 | 538 |
boolean isPermit = false; |
| 539 | 539 |
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
|
| 540 |
- saveSystemLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]"); |
|
| 541 |
- saveSystemLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); |
|
| 542 |
- saveSystemLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); |
|
| 540 |
+ saveLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]"); |
|
| 541 |
+ saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); |
|
| 542 |
+ saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); |
|
| 543 | 543 |
if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
|
| 544 | 544 |
isPermit = true; |
| 545 | 545 |
} |
... | ... | @@ -568,7 +568,7 @@ |
| 568 | 568 |
} |
| 569 | 569 |
|
| 570 | 570 |
try {
|
| 571 |
- saveSystemLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); |
|
| 571 |
+ saveLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); |
|
| 572 | 572 |
channel.write(Bind.makeBindAckBuffer(resultCode)); |
| 573 | 573 |
if ("00".equals(resultCode)) {
|
| 574 | 574 |
/* BIND 성공인 경우 사용자 Pool에 저장 */ |
... | ... | @@ -579,7 +579,7 @@ |
| 579 | 579 |
/* 모니터링 로그 */ |
| 580 | 580 |
HealthCheckServer.saveMonitorLog("[COLLECT SERVER][SERVICE TYPE : " + this.serviceType + "][ID : " + connectUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]");
|
| 581 | 581 |
} catch (IOException e) {
|
| 582 |
- saveSystemLog(e); |
|
| 582 |
+ saveLog(e); |
|
| 583 | 583 |
throw new RuntimeException(e); |
| 584 | 584 |
} |
| 585 | 585 |
} |
--- src/main/java/com/munjaon/server/server/task/ReportBindTask.java
+++ src/main/java/com/munjaon/server/server/task/ReportBindTask.java
... | ... | @@ -63,7 +63,7 @@ |
| 63 | 63 |
if (svc != null) {
|
| 64 | 64 |
memberDto = svc.get(id); |
| 65 | 65 |
} |
| 66 |
- saveSystemLog("[" + this.taskName + "][BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 66 |
+ saveLog("[" + this.taskName + "][BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 67 | 67 |
/* Bind Check */ |
| 68 | 68 |
resultCode = checkBind(memberDto, id, pwd); |
| 69 | 69 |
|
... | ... | @@ -71,9 +71,9 @@ |
| 71 | 71 |
if ("00".equals(resultCode)) {
|
| 72 | 72 |
boolean isPermit = false; |
| 73 | 73 |
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
|
| 74 |
- saveSystemLog("[" + this.taskName + "][REMOTE IP : " + reportUserDto.getRemoteIP() + "]");
|
|
| 75 |
- saveSystemLog("[" + this.taskName + "][ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]");
|
|
| 76 |
- saveSystemLog("[" + this.taskName + "][ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]");
|
|
| 74 |
+ saveLog("[" + this.taskName + "][REMOTE IP : " + reportUserDto.getRemoteIP() + "]");
|
|
| 75 |
+ saveLog("[" + this.taskName + "][ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]");
|
|
| 76 |
+ saveLog("[" + this.taskName + "][ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]");
|
|
| 77 | 77 |
if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
|
| 78 | 78 |
isPermit = true; |
| 79 | 79 |
} |
... | ... | @@ -107,7 +107,7 @@ |
| 107 | 107 |
} |
| 108 | 108 |
|
| 109 | 109 |
try {
|
| 110 |
- saveSystemLog("[" + this.taskName + "][BIND RESULT : " + resultCode + "]");
|
|
| 110 |
+ saveLog("[" + this.taskName + "][BIND RESULT : " + resultCode + "]");
|
|
| 111 | 111 |
channel.write(Bind.makeBindAckBuffer(resultCode)); |
| 112 | 112 |
if ("00".equals(resultCode)) {
|
| 113 | 113 |
/* BIND 성공인 경우 사용자 Pool에 저장 */ |
... | ... | @@ -118,7 +118,7 @@ |
| 118 | 118 |
/* 모니터링 로그 */ |
| 119 | 119 |
HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]");
|
| 120 | 120 |
} catch (IOException e) {
|
| 121 |
- saveSystemLog(e); |
|
| 121 |
+ saveLog(e); |
|
| 122 | 122 |
throw new RuntimeException(e); |
| 123 | 123 |
} |
| 124 | 124 |
} |
--- src/main/java/com/munjaon/server/server/task/ReportLinkCheckTask.java
+++ src/main/java/com/munjaon/server/server/task/ReportLinkCheckTask.java
... | ... | @@ -32,7 +32,7 @@ |
| 32 | 32 |
|
| 33 | 33 |
if (reportUserDto.isAlive() == 2) {
|
| 34 | 34 |
channel.write(LinkCheck.makeLinkCheckBuffer()); |
| 35 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND LINK CHECK ... ... ... ... ... ... ...]");
|
|
| 35 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND LINK CHECK ... ... ... ... ... ... ...]");
|
|
| 36 | 36 |
/* 패킷 전송 시간 체크위한 설정(3초간 유지) */ |
| 37 | 37 |
SEND_CYCLE_CHECK_TIME = System.currentTimeMillis(); |
| 38 | 38 |
/* Packet 전송했는지 여부 */ |
... | ... | @@ -55,13 +55,13 @@ |
| 55 | 55 |
} else if (size == 0) {
|
| 56 | 56 |
Thread.sleep(1); |
| 57 | 57 |
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
|
| 58 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]");
|
|
| 58 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]");
|
|
| 59 | 59 |
expireConnectUser(); |
| 60 | 60 |
this.isExpiredYn = true; |
| 61 | 61 |
break; |
| 62 | 62 |
} |
| 63 | 63 |
} else {
|
| 64 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
|
|
| 64 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
|
|
| 65 | 65 |
expireConnectUser(); |
| 66 | 66 |
throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
|
| 67 | 67 |
} |
... | ... | @@ -72,7 +72,7 @@ |
| 72 | 72 |
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); |
| 73 | 73 |
int size = channel.read(bodyBuffer); |
| 74 | 74 |
if (size > 0) {
|
| 75 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]");
|
|
| 75 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]");
|
|
| 76 | 76 |
reportUserDto.updateLastTrafficTime(); |
| 77 | 77 |
this.isPacketSendYn = false; |
| 78 | 78 |
} |
--- src/main/java/com/munjaon/server/server/task/ReportQueueTask.java
+++ src/main/java/com/munjaon/server/server/task/ReportQueueTask.java
... | ... | @@ -60,7 +60,7 @@ |
| 60 | 60 |
} else {
|
| 61 | 61 |
builder.append(",").append(dto.getMsgId());
|
| 62 | 62 |
} |
| 63 |
- saveSystemLog("reportDto : " + dto.toString());
|
|
| 63 |
+ saveLog("reportDto : " + dto.toString());
|
|
| 64 | 64 |
reportQueue.pushReportToQueue(dto); |
| 65 | 65 |
} catch (Exception e) {
|
| 66 | 66 |
throw new RuntimeException(e); |
--- src/main/java/com/munjaon/server/server/task/ReportReadTask.java
+++ src/main/java/com/munjaon/server/server/task/ReportReadTask.java
... | ... | @@ -76,7 +76,7 @@ |
| 76 | 76 |
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); |
| 77 | 77 |
int size = channel.read(bodyBuffer); |
| 78 | 78 |
if (size > 0) {
|
| 79 |
- saveSystemLog("Recv link check");
|
|
| 79 |
+ saveLog("Recv link check");
|
|
| 80 | 80 |
reportUserDto.updateLastTrafficTime(); |
| 81 | 81 |
} |
| 82 | 82 |
} catch (Exception e) {
|
... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 |
return; |
| 93 | 93 |
} |
| 94 | 94 |
|
| 95 |
- saveSystemLog("recv report");
|
|
| 95 |
+ saveLog("recv report");
|
|
| 96 | 96 |
ReportQueue reportQueue = reportUserDto.getReportQueue(); |
| 97 | 97 |
reportUserDto.updateLastTrafficTime(); |
| 98 | 98 |
if (reportQueue != null) {
|
... | ... | @@ -137,7 +137,7 @@ |
| 137 | 137 |
if (svc != null) {
|
| 138 | 138 |
memberDto = svc.get(id); |
| 139 | 139 |
} |
| 140 |
- saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 140 |
+ saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 141 | 141 |
/* Bind Check */ |
| 142 | 142 |
resultCode = checkBind(memberDto, id, pwd); |
| 143 | 143 |
|
... | ... | @@ -145,9 +145,9 @@ |
| 145 | 145 |
if ("00".equals(resultCode)) {
|
| 146 | 146 |
boolean isPermit = false; |
| 147 | 147 |
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
|
| 148 |
- saveSystemLog("connectUserDto.getRemoteIP() : " + reportUserDto.getRemoteIP());
|
|
| 149 |
- saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
|
|
| 150 |
- saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
|
|
| 148 |
+ saveLog("connectUserDto.getRemoteIP() : " + reportUserDto.getRemoteIP());
|
|
| 149 |
+ saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
|
|
| 150 |
+ saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
|
|
| 151 | 151 |
if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
|
| 152 | 152 |
isPermit = true; |
| 153 | 153 |
} |
... | ... | @@ -182,7 +182,7 @@ |
| 182 | 182 |
} |
| 183 | 183 |
|
| 184 | 184 |
try {
|
| 185 |
- saveSystemLog("Bind ResultCode : " + resultCode);
|
|
| 185 |
+ saveLog("Bind ResultCode : " + resultCode);
|
|
| 186 | 186 |
channel.write(Bind.makeBindAckBuffer(resultCode)); |
| 187 | 187 |
if ("00".equals(resultCode) == false) {
|
| 188 | 188 |
expireConnectUser(); |
... | ... | @@ -202,8 +202,8 @@ |
| 202 | 202 |
|
| 203 | 203 |
String id = Bind.getBindId(bindBuffer); |
| 204 | 204 |
String pwd = Bind.getBindPwd(bindBuffer); |
| 205 |
- saveSystemLog("Bind id : " + id);
|
|
| 206 |
- saveSystemLog("Bind pwd : " + pwd);
|
|
| 205 |
+ saveLog("Bind id : " + id);
|
|
| 206 |
+ saveLog("Bind pwd : " + pwd);
|
|
| 207 | 207 |
if (id == null || pwd == null) {
|
| 208 | 208 |
resultCode = "50"; |
| 209 | 209 |
} else {
|
... | ... | @@ -237,7 +237,7 @@ |
| 237 | 237 |
} |
| 238 | 238 |
|
| 239 | 239 |
try {
|
| 240 |
- saveSystemLog("Bind ResultCode : " + resultCode);
|
|
| 240 |
+ saveLog("Bind ResultCode : " + resultCode);
|
|
| 241 | 241 |
channel.write(Bind.makeBindAckBuffer(resultCode)); |
| 242 | 242 |
if ("00".equals(resultCode) == false) {
|
| 243 | 243 |
expireConnectUser(); |
--- src/main/java/com/munjaon/server/server/task/ReportResultTask.java
+++ src/main/java/com/munjaon/server/server/task/ReportResultTask.java
... | ... | @@ -43,19 +43,19 @@ |
| 43 | 43 |
String command = Header.getCommand(headBuffer); |
| 44 | 44 |
switch (Integer.parseInt(command)) {
|
| 45 | 45 |
case 6 : recvReport(); break; |
| 46 |
- default: saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][INVALID REQUEST][command : " + command + "]");
|
|
| 46 |
+ default: saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][INVALID REQUEST][command : " + command + "]");
|
|
| 47 | 47 |
expireConnectUser(); break; |
| 48 | 48 |
} |
| 49 | 49 |
} else if (size == 0) {
|
| 50 | 50 |
Thread.sleep(1); |
| 51 | 51 |
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
|
| 52 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]");
|
|
| 52 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]");
|
|
| 53 | 53 |
expireConnectUser(); |
| 54 | 54 |
this.isExpiredYn = true; |
| 55 | 55 |
break; |
| 56 | 56 |
} |
| 57 | 57 |
} else {
|
| 58 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
|
|
| 58 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
|
|
| 59 | 59 |
expireConnectUser(); |
| 60 | 60 |
throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
|
| 61 | 61 |
} |
... | ... | @@ -69,12 +69,12 @@ |
| 69 | 69 |
return; |
| 70 | 70 |
} |
| 71 | 71 |
|
| 72 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT ACK ... ... ... ... ... ... ...]");
|
|
| 72 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT ACK ... ... ... ... ... ... ...]");
|
|
| 73 | 73 |
ReportQueue reportQueue = reportUserDto.getReportQueue(); |
| 74 | 74 |
reportUserDto.updateLastTrafficTime(); |
| 75 | 75 |
this.isPacketSendYn = false; |
| 76 | 76 |
if (reportQueue != null && this.reportDto != null) {
|
| 77 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT : " + this.reportDto.toString() + "]");
|
|
| 77 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT : " + this.reportDto.toString() + "]");
|
|
| 78 | 78 |
reportQueue.addReadCounter(); |
| 79 | 79 |
} |
| 80 | 80 |
} |
... | ... | @@ -89,7 +89,7 @@ |
| 89 | 89 |
if (reportDto == null) {
|
| 90 | 90 |
return; |
| 91 | 91 |
} |
| 92 |
- saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][REPORT SEND : " + reportDto.toString() + "]");
|
|
| 92 |
+ saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][REPORT SEND : " + reportDto.toString() + "]");
|
|
| 93 | 93 |
ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH); |
| 94 | 94 |
Packet.setDefaultByte(reportBuffer); |
| 95 | 95 |
Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH); |
--- src/main/java/com/munjaon/server/server/task/ReportServerTask.java
+++ src/main/java/com/munjaon/server/server/task/ReportServerTask.java
... | ... | @@ -61,9 +61,9 @@ |
| 61 | 61 |
this.reportQueue = reportUserDto.getReportQueue(); |
| 62 | 62 |
this.logger = logger; |
| 63 | 63 |
if (reportUserDto.isLogin()) {
|
| 64 |
- saveSystemLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]");
|
|
| 64 |
+ saveLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]");
|
|
| 65 | 65 |
} else {
|
| 66 |
- saveSystemLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
|
|
| 66 |
+ saveLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
|
|
| 67 | 67 |
} |
| 68 | 68 |
} |
| 69 | 69 |
|
... | ... | @@ -102,7 +102,7 @@ |
| 102 | 102 |
|
| 103 | 103 |
@Override |
| 104 | 104 |
public void run() {
|
| 105 |
- saveSystemLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); |
|
| 105 |
+ saveLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); |
|
| 106 | 106 |
/* 최초 RUN Flag 체크 */ |
| 107 | 107 |
reloadRunFlag(); |
| 108 | 108 |
try {
|
... | ... | @@ -116,9 +116,9 @@ |
| 116 | 116 |
} |
| 117 | 117 |
/* 2. Packet Timeout Check */ |
| 118 | 118 |
if (checkTimeOut()) {
|
| 119 |
- saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); |
|
| 119 |
+ saveLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); |
|
| 120 | 120 |
expireConnectUser(); |
| 121 |
- saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 121 |
+ saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 122 | 122 |
break; |
| 123 | 123 |
} |
| 124 | 124 |
|
... | ... | @@ -135,7 +135,7 @@ |
| 135 | 135 |
/* 세션 만료 여부 */ |
| 136 | 136 |
this.isExpiredYn = true; |
| 137 | 137 |
this.IS_ERROR = true; |
| 138 |
- saveSystemLog(e); |
|
| 138 |
+ saveLog(e); |
|
| 139 | 139 |
} |
| 140 | 140 |
/* 중요 : 사용자 Thread 실행모드 Off */ |
| 141 | 141 |
reportUserDto.setRunningMode(false); |
... | ... | @@ -143,7 +143,7 @@ |
| 143 | 143 |
if (IS_ERROR) {
|
| 144 | 144 |
expireConnectUser(); |
| 145 | 145 |
} |
| 146 |
- saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 146 |
+ saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); |
|
| 147 | 147 |
} |
| 148 | 148 |
|
| 149 | 149 |
private boolean checkTimeOut() {
|
... | ... | @@ -217,7 +217,7 @@ |
| 217 | 217 |
if (svc != null) {
|
| 218 | 218 |
memberDto = svc.get(id); |
| 219 | 219 |
} |
| 220 |
- saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); |
|
| 220 |
+ saveLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); |
|
| 221 | 221 |
/* Bind Check */ |
| 222 | 222 |
resultCode = checkBind(memberDto, id, pwd); |
| 223 | 223 |
|
... | ... | @@ -225,9 +225,9 @@ |
| 225 | 225 |
if ("00".equals(resultCode)) {
|
| 226 | 226 |
boolean isPermit = false; |
| 227 | 227 |
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
|
| 228 |
- saveSystemLog(printTaskLog() + "[REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); |
|
| 229 |
- saveSystemLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); |
|
| 230 |
- saveSystemLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); |
|
| 228 |
+ saveLog(printTaskLog() + "[REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); |
|
| 229 |
+ saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); |
|
| 230 |
+ saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); |
|
| 231 | 231 |
if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
|
| 232 | 232 |
isPermit = true; |
| 233 | 233 |
} |
... | ... | @@ -257,11 +257,11 @@ |
| 257 | 257 |
} |
| 258 | 258 |
} catch (Exception e) {
|
| 259 | 259 |
resultCode = "10"; |
| 260 |
- saveSystemLog(e); |
|
| 260 |
+ saveLog(e); |
|
| 261 | 261 |
} |
| 262 | 262 |
|
| 263 | 263 |
try {
|
| 264 |
- saveSystemLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); |
|
| 264 |
+ saveLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); |
|
| 265 | 265 |
channel.write(Bind.makeBindAckBuffer(resultCode)); |
| 266 | 266 |
if ("00".equals(resultCode)) {
|
| 267 | 267 |
/* BIND 성공인 경우 사용자 Pool에 저장 */ |
... | ... | @@ -272,7 +272,7 @@ |
| 272 | 272 |
/* 모니터링 로그 */ |
| 273 | 273 |
HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]");
|
| 274 | 274 |
} catch (IOException e) {
|
| 275 |
- saveSystemLog(e); |
|
| 275 |
+ saveLog(e); |
|
| 276 | 276 |
throw new RuntimeException(e); |
| 277 | 277 |
} |
| 278 | 278 |
} |
... | ... | @@ -305,7 +305,7 @@ |
| 305 | 305 |
switch (Integer.parseInt(command)) {
|
| 306 | 306 |
case 6 : recvReport(channel); break; |
| 307 | 307 |
case 8 : recvLinkCheck(channel); break; |
| 308 |
- default: saveSystemLog(printTaskLog() + "[INVALID REQUEST][command : " + command + "]"); |
|
| 308 |
+ default: saveLog(printTaskLog() + "[INVALID REQUEST][command : " + command + "]"); |
|
| 309 | 309 |
expireConnectUser(); break; |
| 310 | 310 |
} |
| 311 | 311 |
/* 마지막 패킷 수신시간 체크 */ |
... | ... | @@ -313,13 +313,13 @@ |
| 313 | 313 |
} else if (size == 0) {
|
| 314 | 314 |
Thread.sleep(1); |
| 315 | 315 |
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
|
| 316 |
- saveSystemLog(printTaskLog() + "[SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); |
|
| 316 |
+ saveLog(printTaskLog() + "[SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); |
|
| 317 | 317 |
expireConnectUser(); |
| 318 | 318 |
this.isExpiredYn = true; |
| 319 | 319 |
break; |
| 320 | 320 |
} |
| 321 | 321 |
} else {
|
| 322 |
- saveSystemLog(printTaskLog() + "[recvInterest : size is zero]"); |
|
| 322 |
+ saveLog(printTaskLog() + "[recvInterest : size is zero]"); |
|
| 323 | 323 |
expireConnectUser(); |
| 324 | 324 |
throw new IOException("[recvInterest : size is zero]");
|
| 325 | 325 |
} |
... | ... | @@ -330,7 +330,7 @@ |
| 330 | 330 |
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); |
| 331 | 331 |
int size = channel.read(bodyBuffer); |
| 332 | 332 |
if (size > 0) {
|
| 333 |
- saveSystemLog(printTaskLog() + "[RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); |
|
| 333 |
+ saveLog(printTaskLog() + "[RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); |
|
| 334 | 334 |
reportUserDto.updateLastTrafficTime(); |
| 335 | 335 |
this.isPacketSendYn = false; |
| 336 | 336 |
} |
... | ... | @@ -343,12 +343,12 @@ |
| 343 | 343 |
return; |
| 344 | 344 |
} |
| 345 | 345 |
|
| 346 |
- saveSystemLog(printTaskLog() + "[RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); |
|
| 346 |
+ saveLog(printTaskLog() + "[RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); |
|
| 347 | 347 |
ReportQueue reportQueue = reportUserDto.getReportQueue(); |
| 348 | 348 |
reportUserDto.updateLastTrafficTime(); |
| 349 | 349 |
this.isPacketSendYn = false; |
| 350 | 350 |
if (reportQueue != null && this.reportDto != null) {
|
| 351 |
- saveSystemLog(printTaskLog() + "[RECEIVE REPORT : " + this.reportDto.toString() + "]"); |
|
| 351 |
+ saveLog(printTaskLog() + "[RECEIVE REPORT : " + this.reportDto.toString() + "]"); |
|
| 352 | 352 |
reportQueue.addReadCounter(); |
| 353 | 353 |
} |
| 354 | 354 |
} |
... | ... | @@ -359,7 +359,7 @@ |
| 359 | 359 |
} |
| 360 | 360 |
if (reportUserDto.isAlive() == 2) {
|
| 361 | 361 |
channel.write(LinkCheck.makeLinkCheckBuffer()); |
| 362 |
- saveSystemLog(printTaskLog() + "[SEND LINK CHECK ... ... ... ... ... ... ...]"); |
|
| 362 |
+ saveLog(printTaskLog() + "[SEND LINK CHECK ... ... ... ... ... ... ...]"); |
|
| 363 | 363 |
SEND_CYCLE_CHECK_TIME = System.currentTimeMillis(); |
| 364 | 364 |
/* Packet 전송했는지 여부 */ |
| 365 | 365 |
isPacketSendYn = true; |
... | ... | @@ -369,7 +369,7 @@ |
| 369 | 369 |
if (reportDto == null) {
|
| 370 | 370 |
return; |
| 371 | 371 |
} |
| 372 |
- saveSystemLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]"); |
|
| 372 |
+ saveLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]"); |
|
| 373 | 373 |
ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH); |
| 374 | 374 |
Packet.setDefaultByte(reportBuffer); |
| 375 | 375 |
Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH); |
... | ... | @@ -388,7 +388,7 @@ |
| 388 | 388 |
} |
| 389 | 389 |
try {
|
| 390 | 390 |
SocketChannel channel = (SocketChannel) key.channel(); |
| 391 |
- saveSystemLog("[ReportServerTask]Expire connect user: " + reportUserDto);
|
|
| 391 |
+ saveLog("[ReportServerTask]Expire connect user: " + reportUserDto);
|
|
| 392 | 392 |
if (reportUserDto != null) {
|
| 393 | 393 |
if (reportUserDto.getUserId() != null) {
|
| 394 | 394 |
reportUserQueue.removeUser(reportUserDto.getUserId()); |
... | ... | @@ -404,7 +404,7 @@ |
| 404 | 404 |
// 키 닫기 |
| 405 | 405 |
key.cancel(); |
| 406 | 406 |
} catch (IOException e) {
|
| 407 |
- saveSystemLog(e); |
|
| 407 |
+ saveLog(e); |
|
| 408 | 408 |
} |
| 409 | 409 |
} |
| 410 | 410 |
|
--- src/main/java/com/munjaon/server/server/task/SendReadTask.java
+++ src/main/java/com/munjaon/server/server/task/SendReadTask.java
... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 |
private boolean isExpireService() {
|
| 100 | 100 |
ConnectUserDto checkConnectUserDto = collectUserQueue.getUser(this.serviceType, this.connectUserDto.getUserId()); |
| 101 | 101 |
MemberDto memberDto = checkConnectUserDto.getMemberDto(); |
| 102 |
- saveSystemLog("[isExpireService : " + memberDto.toString() + "]");
|
|
| 102 |
+ saveLog("[isExpireService : " + memberDto.toString() + "]");
|
|
| 103 | 103 |
if (memberDto == null) {
|
| 104 | 104 |
return true; |
| 105 | 105 |
} |
... | ... | @@ -171,7 +171,7 @@ |
| 171 | 171 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice())); |
| 172 | 172 |
} |
| 173 | 173 |
|
| 174 |
- saveSystemLog("[SMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 174 |
+ saveLog("[SMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 175 | 175 |
QueueTypeWorker worker = QueueTypeWorker.find("SMS");
|
| 176 | 176 |
if (worker != null) {
|
| 177 | 177 |
worker.pushQueue(messageDto); |
... | ... | @@ -203,7 +203,7 @@ |
| 203 | 203 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice())); |
| 204 | 204 |
} |
| 205 | 205 |
|
| 206 |
- saveSystemLog("[LMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 206 |
+ saveLog("[LMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 207 | 207 |
QueueTypeWorker worker = QueueTypeWorker.find("LMS");
|
| 208 | 208 |
if (worker != null) {
|
| 209 | 209 |
worker.pushQueue(messageDto); |
... | ... | @@ -251,7 +251,7 @@ |
| 251 | 251 |
} else if (i == 2) {
|
| 252 | 252 |
messageDto.setUserFileName03(imagePath + File.separator + fileName); |
| 253 | 253 |
} |
| 254 |
- saveSystemLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 254 |
+ saveLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 255 | 255 |
} |
| 256 | 256 |
|
| 257 | 257 |
/* 사용자 단가, 발송망 설정 */ |
... | ... | @@ -272,7 +272,7 @@ |
| 272 | 272 |
messageDto.setUnitCost(String.valueOf(mmsPrice)); |
| 273 | 273 |
} |
| 274 | 274 |
|
| 275 |
- saveSystemLog("[MMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 275 |
+ saveLog("[MMS] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 276 | 276 |
QueueTypeWorker worker = QueueTypeWorker.find("MMS");
|
| 277 | 277 |
if (worker != null) {
|
| 278 | 278 |
worker.pushQueue(messageDto); |
... | ... | @@ -312,7 +312,7 @@ |
| 312 | 312 |
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); |
| 313 | 313 |
|
| 314 | 314 |
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); |
| 315 |
- saveSystemLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 315 |
+ saveLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 316 | 316 |
|
| 317 | 317 |
/* 사용자 단가, 발송망 설정 */ |
| 318 | 318 |
MemberDto savedMemberDto = null; |
... | ... | @@ -324,13 +324,13 @@ |
| 324 | 324 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice())); |
| 325 | 325 |
} |
| 326 | 326 |
|
| 327 |
- saveSystemLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 327 |
+ saveLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 328 | 328 |
QueueTypeWorker worker = QueueTypeWorker.find("KAT");
|
| 329 | 329 |
if (worker != null) {
|
| 330 | 330 |
worker.pushQueue(messageDto); |
| 331 | 331 |
channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus())); |
| 332 | 332 |
} else {
|
| 333 |
- saveSystemLog("worker is null");
|
|
| 333 |
+ saveLog("worker is null");
|
|
| 334 | 334 |
} |
| 335 | 335 |
} catch (Exception e) {
|
| 336 | 336 |
e.printStackTrace(); |
... | ... | @@ -366,7 +366,7 @@ |
| 366 | 366 |
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); |
| 367 | 367 |
|
| 368 | 368 |
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); |
| 369 |
- saveSystemLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 369 |
+ saveLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
|
|
| 370 | 370 |
|
| 371 | 371 |
/* 사용자 단가, 발송망 설정 */ |
| 372 | 372 |
MemberDto savedMemberDto = null; |
... | ... | @@ -378,7 +378,7 @@ |
| 378 | 378 |
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice())); |
| 379 | 379 |
} |
| 380 | 380 |
|
| 381 |
- saveSystemLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 381 |
+ saveLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]");
|
|
| 382 | 382 |
QueueTypeWorker worker = QueueTypeWorker.find("KFT");
|
| 383 | 383 |
if (worker != null) {
|
| 384 | 384 |
worker.pushQueue(messageDto); |
... | ... | @@ -417,7 +417,7 @@ |
| 417 | 417 |
if (svc != null) {
|
| 418 | 418 |
memberDto = svc.get(id); |
| 419 | 419 |
} |
| 420 |
- saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 420 |
+ saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
|
|
| 421 | 421 |
/* Bind Check */ |
| 422 | 422 |
resultCode = checkBind(memberDto, this.serviceType, id, pwd); |
| 423 | 423 |
|
... | ... | @@ -425,9 +425,9 @@ |
| 425 | 425 |
if ("00".equals(resultCode)) {
|
| 426 | 426 |
boolean isPermit = false; |
| 427 | 427 |
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
|
| 428 |
- saveSystemLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP());
|
|
| 429 |
- saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
|
|
| 430 |
- saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
|
|
| 428 |
+ saveLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP());
|
|
| 429 |
+ saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
|
|
| 430 |
+ saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
|
|
| 431 | 431 |
if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
|
| 432 | 432 |
isPermit = true; |
| 433 | 433 |
} |
... | ... | @@ -458,7 +458,7 @@ |
| 458 | 458 |
} |
| 459 | 459 |
|
| 460 | 460 |
try {
|
| 461 |
- saveSystemLog("[BIND RESULT : " + resultCode + "]");
|
|
| 461 |
+ saveLog("[BIND RESULT : " + resultCode + "]");
|
|
| 462 | 462 |
channel.write(Bind.makeBindAckBuffer(resultCode)); |
| 463 | 463 |
if ("00".equals(resultCode) == false) {
|
| 464 | 464 |
expireConnectUser(); |
--- src/main/java/com/munjaon/server/server/task/StatusCheckTask.java
+++ src/main/java/com/munjaon/server/server/task/StatusCheckTask.java
... | ... | @@ -27,28 +27,28 @@ |
| 27 | 27 |
|
| 28 | 28 |
@Override |
| 29 | 29 |
public void run() {
|
| 30 |
- saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]");
|
|
| 30 |
+ saveLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]");
|
|
| 31 | 31 |
List<ConnectUserDto> userList = collectUserQueue.getUsers(this.serviceType); |
| 32 | 32 |
if (userList == null || userList.isEmpty()) {
|
| 33 |
- saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]");
|
|
| 34 |
- saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
|
|
| 33 |
+ saveLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]");
|
|
| 34 |
+ saveLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
|
|
| 35 | 35 |
return; |
| 36 | 36 |
} |
| 37 | 37 |
|
| 38 | 38 |
MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService(); |
| 39 | 39 |
for (ConnectUserDto user : userList) {
|
| 40 | 40 |
MemberDto savedMemberDto = user.getMemberDto(); |
| 41 |
- saveSystemLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]");
|
|
| 41 |
+ saveLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]");
|
|
| 42 | 42 |
MemberDto newMemberDto = svc.get(savedMemberDto.getMberId()); |
| 43 |
- saveSystemLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]");
|
|
| 43 |
+ saveLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]");
|
|
| 44 | 44 |
if (newMemberDto == null) {
|
| 45 | 45 |
savedMemberDto.setMberSttus("N");
|
| 46 | 46 |
} else {
|
| 47 | 47 |
user.setMemberDto(newMemberDto); |
| 48 | 48 |
} |
| 49 |
- saveSystemLog("[" + this.serviceType + "][USER AFTER STATUS : " + savedMemberDto.toString() + "]");
|
|
| 49 |
+ saveLog("[" + this.serviceType + "][USER AFTER STATUS : " + savedMemberDto.toString() + "]");
|
|
| 50 | 50 |
} |
| 51 |
- saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
|
|
| 51 |
+ saveLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
|
|
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 | 54 |
private void saveSystemLog(Object obj) {
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?