tolag3/mjon_agent_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

전송큐 pushQueue 메소드 시그니처 수정

Browse Source
This commit is contained in:
jangdongsin 2024-10-14 16:02:58 +09:00
parent 0e3b0fd1c7
commit 011366d31b
22 changed files with 162 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/munjaon/server/queue/enums/QueueTypeWorker.java
View File

@ -36,7 +36,7 @@ public enum QueueTypeWorker {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
SmsQueueService smsQueueService = (SmsQueueService) QueueService.SMS_QUEUE_SERVICE.getService(); SmsQueueService smsQueueService = (SmsQueueService) QueueService.SMS_QUEUE_SERVICE.getService();
smsQueueService.pushQueue(data); smsQueueService.pushQueue(data);
} }
@ -103,7 +103,7 @@ public enum QueueTypeWorker {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
LmsQueueService lmsQueueService = (LmsQueueService) QueueService.LMS_QUEUE_SERVICE.getService(); LmsQueueService lmsQueueService = (LmsQueueService) QueueService.LMS_QUEUE_SERVICE.getService();
lmsQueueService.pushQueue(data); lmsQueueService.pushQueue(data);
} }
@ -170,7 +170,7 @@ public enum QueueTypeWorker {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
MmsQueueService mmsQueueService = (MmsQueueService) QueueService.MMS_QUEUE_SERVICE.getService(); MmsQueueService mmsQueueService = (MmsQueueService) QueueService.MMS_QUEUE_SERVICE.getService();
mmsQueueService.pushQueue(data); mmsQueueService.pushQueue(data);
} }
@ -237,7 +237,7 @@ public enum QueueTypeWorker {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
KakaoAlarmQueueService kakaoAlarmQueueService = (KakaoAlarmQueueService) QueueService.KAT_QUEUE_SERVICE.getService(); KakaoAlarmQueueService kakaoAlarmQueueService = (KakaoAlarmQueueService) QueueService.KAT_QUEUE_SERVICE.getService();
kakaoAlarmQueueService.pushQueue(data); kakaoAlarmQueueService.pushQueue(data);
} }
@ -304,7 +304,7 @@ public enum QueueTypeWorker {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
KakaoFriendQueueService kakaoFriendQueueService = (KakaoFriendQueueService) QueueService.KFT_QUEUE_SERVICE.getService(); KakaoFriendQueueService kakaoFriendQueueService = (KakaoFriendQueueService) QueueService.KFT_QUEUE_SERVICE.getService();
kakaoFriendQueueService.pushQueue(data); kakaoFriendQueueService.pushQueue(data);
} }
@ -366,7 +366,7 @@ public enum QueueTypeWorker {
public abstract boolean isExistQueue(String name); public abstract boolean isExistQueue(String name);
public abstract void removeQueue(String name); public abstract void removeQueue(String name);
public abstract void addQueue(WriteQueue queue); public abstract void addQueue(WriteQueue queue);
public abstract void pushQueue(BasicMessageDto data); public abstract void pushQueue(BasicMessageDto data) throws Exception;
public abstract int saveMessageToTable(BasicMessageDto data); public abstract int saveMessageToTable(BasicMessageDto data);
public abstract int saveMessageForList(List<BasicMessageDto> list); public abstract int saveMessageForList(List<BasicMessageDto> list);

6
src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java
View File

@ -43,7 +43,11 @@ public class KakaoAlarmQueueService implements QueueAction {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
queueInstance.pushQueue(data);
}
public void pushQueue_bak(BasicMessageDto data) {
boolean isError = false; boolean isError = false;
try { try {
queueInstance.pushQueue(data); queueInstance.pushQueue(data);

6
src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java
View File

@ -43,7 +43,11 @@ public class KakaoFriendQueueService implements QueueAction {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
queueInstance.pushQueue(data);
}
public void pushQueue_bak(BasicMessageDto data) {
boolean isError = false; boolean isError = false;
try { try {
queueInstance.pushQueue(data); queueInstance.pushQueue(data);

6
src/main/java/com/munjaon/server/queue/service/LmsQueueService.java
View File

@ -43,7 +43,11 @@ public class LmsQueueService implements QueueAction {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
queueInstance.pushQueue(data);
}
public void pushQueue_bak(BasicMessageDto data) {
boolean isError = false; boolean isError = false;
try { try {
queueInstance.pushQueue(data); queueInstance.pushQueue(data);

6
src/main/java/com/munjaon/server/queue/service/MmsQueueService.java
View File

@ -43,7 +43,11 @@ public class MmsQueueService implements QueueAction {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
queueInstance.pushQueue(data);
}
public void pushQueue_bak(BasicMessageDto data) {
boolean isError = false; boolean isError = false;
try { try {
queueInstance.pushQueue(data); queueInstance.pushQueue(data);

2
src/main/java/com/munjaon/server/queue/service/QueueAction.java
View File

@ -10,7 +10,7 @@ public interface QueueAction {
boolean isExistQueue(String name); boolean isExistQueue(String name);
void removeQueue(String name); void removeQueue(String name);
void addQueue(WriteQueue queue); void addQueue(WriteQueue queue);
void pushQueue(BasicMessageDto data); void pushQueue(BasicMessageDto data) throws Exception;
int saveMessageToTable(BasicMessageDto data); int saveMessageToTable(BasicMessageDto data);
int saveMessageForList(List<BasicMessageDto> list); int saveMessageForList(List<BasicMessageDto> list);

6
src/main/java/com/munjaon/server/queue/service/SmsQueueService.java
View File

@ -43,7 +43,11 @@ public class SmsQueueService implements QueueAction {
} }
@Override @Override
public void pushQueue(BasicMessageDto data) { public void pushQueue(BasicMessageDto data) throws Exception {
queueInstance.pushQueue(data);
}
public void pushQueue_bak(BasicMessageDto data) {
boolean isError = false; boolean isError = false;
try { try {
queueInstance.pushQueue(data); queueInstance.pushQueue(data);

2
src/main/java/com/munjaon/server/server/service/CollectBackServerService.java
View File

@ -296,7 +296,7 @@ public class CollectBackServerService extends Service {
} }
} }
private void recvDeliver(SocketChannel channel, ByteBuffer buffer, ConnectUserDto userDto) throws IOException { private void recvDeliver(SocketChannel channel, ByteBuffer buffer, ConnectUserDto userDto) throws Exception {
BasicMessageDto messageDto = new BasicMessageDto(); BasicMessageDto messageDto = new BasicMessageDto();
messageDto.setRouterSeq("40"); messageDto.setRouterSeq("40");
messageDto.setServiceType("4"); messageDto.setServiceType("4");

10
src/main/java/com/munjaon/server/server/service/CollectServer.java
View File

@ -115,7 +115,7 @@ public class CollectServer extends Service {
if (key.isValid()) { if (key.isValid()) {
if (key.isAcceptable()) { // 접속일 경우.. if (key.isAcceptable()) { // 접속일 경우..
saveSystemLog("CONNECTION IS ACCEPTABLE ... ..."); saveLog("CONNECTION IS ACCEPTABLE ... ...");
accept(selector, key); accept(selector, key);
} else if (key.isReadable()) { // 수신일 경우.. } else if (key.isReadable()) { // 수신일 경우..
ConnectUserDto connectUserDto = (ConnectUserDto) key.attachment(); ConnectUserDto connectUserDto = (ConnectUserDto) key.attachment();
@ -171,11 +171,11 @@ public class CollectServer extends Service {
/* 소켓 취득 */ /* 소켓 취득 */
Socket socket = channel.socket(); Socket socket = channel.socket();
InetAddress inetAddress = socket.getInetAddress(); InetAddress inetAddress = socket.getInetAddress();
saveSystemLog("[CLIENT CONNECTION IP : " + inetAddress.getHostAddress() + "]"); saveLog("[CLIENT CONNECTION IP : " + inetAddress.getHostAddress() + "]");
// Socket 채널을 channel에 수신 등록한다 // Socket 채널을 channel에 수신 등록한다
channel.register(selector, SelectionKey.OP_READ, ConnectUserDto.builder().serviceType(this.serviceType).lastTrafficTime(System.currentTimeMillis()).remoteIP(inetAddress.getHostAddress()).build()); channel.register(selector, SelectionKey.OP_READ, ConnectUserDto.builder().serviceType(this.serviceType).lastTrafficTime(System.currentTimeMillis()).remoteIP(inetAddress.getHostAddress()).build());
} catch (Exception e) { } catch (Exception e) {
saveSystemLog(e.toString()); saveLog(e.toString());
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ -188,7 +188,7 @@ public class CollectServer extends Service {
SocketChannel channel = (SocketChannel) key.channel(); SocketChannel channel = (SocketChannel) key.channel();
ConnectUserDto userDto = (ConnectUserDto) key.attachment(); ConnectUserDto userDto = (ConnectUserDto) key.attachment();
if (userDto != null && userDto.getUserId() != null) { if (userDto != null && userDto.getUserId() != null) {
saveSystemLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]"); saveLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]");
collectUserQueue.removeUser(this.serviceType, userDto.getUserId()); collectUserQueue.removeUser(this.serviceType, userDto.getUserId());
key.attach(null); key.attach(null);
/* 모니터링 로그 */ /* 모니터링 로그 */
@ -199,7 +199,7 @@ public class CollectServer extends Service {
// 키 닫기 // 키 닫기
key.cancel(); key.cancel();
} catch (IOException e) { } catch (IOException e) {
saveSystemLog(e.toString()); saveLog(e.toString());
e.printStackTrace(); e.printStackTrace();
} }
} }

6
src/main/java/com/munjaon/server/server/service/HealthCheckServer.java
View File

@ -102,7 +102,7 @@ public class HealthCheckServer extends Service {
break; break;
} }
saveSystemLog(msg); saveLog(msg);
if ("Y".equals(slackYn)) { if ("Y".equals(slackYn)) {
JSONObject payload = new JSONObject(); JSONObject payload = new JSONObject();
payload.put("text", msg); payload.put("text", msg);
@ -200,8 +200,8 @@ public class HealthCheckServer extends Service {
} }
} }
} catch (IOException e) { } catch (IOException e) {
saveSystemLog("Connect Fail to [PORT : " + port + "]"); saveLog("Connect Fail to [PORT : " + port + "]");
saveSystemLog("ERROR [" + e.getMessage() + "]"); saveLog("ERROR [" + e.getMessage() + "]");
} finally { } finally {
if (socketChannel != null) { if (socketChannel != null) {
try { try {

9
src/main/java/com/munjaon/server/server/service/QueueServerService.java
View File

@ -76,12 +76,16 @@ public class QueueServerService extends Service {
writeQueue.initQueue(); writeQueue.initQueue();
/* 읽기 큐 */ /* 읽기 큐 */
readQueue.initQueue(); readQueue.initQueue();
/* 최초 큐정보 */
saveSystemLog("[INIT_LOAD_BEFORE][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
/* 큐 초기화 */ /* 큐 초기화 */
initQueue(); initQueue();
/* 큐 pool에 등록 */ /* 큐 pool에 등록 */
worker.addQueue(writeQueue); worker.addQueue(writeQueue);
/* 메모리큐에서 다시 적재하기 */ /* 메모리큐에서 다시 적재하기 */
loadMemoryQueue(); loadMemoryQueue();
/* 최종 큐정보 */
saveSystemLog("[INIT_LOAD_AFTER][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
} }
} catch (Exception e) { } catch (Exception e) {
saveSystemLog(e.toString()); saveSystemLog(e.toString());
@ -171,6 +175,7 @@ public class QueueServerService extends Service {
isQueueInit = true; isQueueInit = true;
} }
if (isQueueInit) { if (isQueueInit) {
saveSystemLog("[QUEUE_INIT_START][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
/* 큐 백업 */ /* 큐 백업 */
writeQueue.backupQueue(); writeQueue.backupQueue();
/* 커밋 카운트 초기화 */ /* 커밋 카운트 초기화 */
@ -182,6 +187,8 @@ public class QueueServerService extends Service {
worker.addQueue(writeQueue); worker.addQueue(writeQueue);
/* 메모리큐에서 다시 적재하기 */ /* 메모리큐에서 다시 적재하기 */
loadMemoryQueue(); loadMemoryQueue();
saveSystemLog("[QUEUE_INIT_END][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]");
} }
} }
@ -241,6 +248,8 @@ public class QueueServerService extends Service {
worker.removeQueue(writeQueue.getQueueInfo().getQueueName()); worker.removeQueue(writeQueue.getQueueInfo().getQueueName());
/* 자원 해제 */ /* 자원 해제 */
writeQueue.close(); writeQueue.close();
saveSystemLog("[QUEUE_RELEASE][QUEUE_NAME : " + writeQueue.getQueueName() + "]");
} }
if (readQueue != null) { if (readQueue != null) {

12
src/main/java/com/munjaon/server/server/service/ReportServer.java
View File

@ -185,7 +185,7 @@ public class ReportServer extends Service {
if (key.isValid()) { if (key.isValid()) {
if (key.isAcceptable()) { // 접속일 경우.. if (key.isAcceptable()) { // 접속일 경우..
saveSystemLog("CONNECTION IS ACCEPTABLE ... ..."); saveLog("CONNECTION IS ACCEPTABLE ... ...");
accept(selector, key); accept(selector, key);
} else if (key.isReadable()) { // 수신일 경우.. } else if (key.isReadable()) { // 수신일 경우..
ReportUserDto reportUserDto = (ReportUserDto) key.attachment(); ReportUserDto reportUserDto = (ReportUserDto) key.attachment();
@ -218,7 +218,7 @@ public class ReportServer extends Service {
if (key.isValid()) { if (key.isValid()) {
if (key.isAcceptable()) { // 접속일 경우.. if (key.isAcceptable()) { // 접속일 경우..
saveSystemLog("CONNECTION IS ACCEPTABLE ... ..."); saveLog("CONNECTION IS ACCEPTABLE ... ...");
accept(selector, key); accept(selector, key);
} else if (key.isReadable()) { // 수신일 경우.. } else if (key.isReadable()) { // 수신일 경우..
ReportUserDto reportUserDto = (ReportUserDto) key.attachment(); ReportUserDto reportUserDto = (ReportUserDto) key.attachment();
@ -245,11 +245,11 @@ public class ReportServer extends Service {
/* 소켓 취득 */ /* 소켓 취득 */
Socket socket = channel.socket(); Socket socket = channel.socket();
SocketAddress remoteAddr = socket.getRemoteSocketAddress(); SocketAddress remoteAddr = socket.getRemoteSocketAddress();
saveSystemLog("Connected to: " + remoteAddr); saveLog("Connected to: " + remoteAddr);
// Socket 채널을 channel에 수신 등록한다 // Socket 채널을 channel에 수신 등록한다
channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + getProp("QUEUE_PATH")).build()); channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + getProp("QUEUE_PATH")).build());
} catch (Exception e) { } catch (Exception e) {
saveSystemLog(e.toString()); saveLog(e.toString());
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ -261,7 +261,7 @@ public class ReportServer extends Service {
try { try {
SocketChannel channel = (SocketChannel) key.channel(); SocketChannel channel = (SocketChannel) key.channel();
ReportUserDto userDto = (ReportUserDto) key.attachment(); ReportUserDto userDto = (ReportUserDto) key.attachment();
saveSystemLog("Expire connect user: " + userDto); saveLog("Expire connect user: " + userDto);
if (userDto != null && userDto.getUserId() != null) { if (userDto != null && userDto.getUserId() != null) {
reportUserQueue.removeUser(userDto.getUserId()); reportUserQueue.removeUser(userDto.getUserId());
// connectUserMap.remove(userDto.getUserId()); // connectUserMap.remove(userDto.getUserId());
@ -274,7 +274,7 @@ public class ReportServer extends Service {
// 키 닫기 // 키 닫기
key.cancel(); key.cancel();
} catch (IOException e) { } catch (IOException e) {
saveSystemLog(e.toString()); saveLog(e.toString());
e.printStackTrace(); e.printStackTrace();
} }
} }

28
src/main/java/com/munjaon/server/server/task/CollectReadTask.java
View File

@ -178,7 +178,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice()));
} }
saveSystemLog("[SMS] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[SMS] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("SMS"); QueueTypeWorker worker = QueueTypeWorker.find("SMS");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -210,7 +210,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice()));
} }
saveSystemLog("[LMS] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[LMS] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("LMS"); QueueTypeWorker worker = QueueTypeWorker.find("LMS");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -258,7 +258,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
} else if (i == 2) { } else if (i == 2) {
messageDto.setUserFileName03(imagePath + File.separator + fileName); messageDto.setUserFileName03(imagePath + File.separator + fileName);
} }
saveSystemLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]");
} }
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
@ -279,7 +279,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
messageDto.setUnitCost(String.valueOf(mmsPrice)); messageDto.setUnitCost(String.valueOf(mmsPrice));
} }
saveSystemLog("[MMS] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[MMS] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("MMS"); QueueTypeWorker worker = QueueTypeWorker.find("MMS");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -319,7 +319,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
saveSystemLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
MemberDto savedMemberDto = null; MemberDto savedMemberDto = null;
@ -331,13 +331,13 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice()));
} }
saveSystemLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("KAT"); QueueTypeWorker worker = QueueTypeWorker.find("KAT");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus())); channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
} else { } else {
saveSystemLog("worker is null"); saveLog("worker is null");
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -373,7 +373,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
saveSystemLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
MemberDto savedMemberDto = null; MemberDto savedMemberDto = null;
@ -385,7 +385,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice()));
} }
saveSystemLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("KFT"); QueueTypeWorker worker = QueueTypeWorker.find("KFT");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -424,7 +424,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
if (svc != null) { if (svc != null) {
memberDto = svc.get(id); memberDto = svc.get(id);
} }
saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
/* Bind Check */ /* Bind Check */
resultCode = checkBind(memberDto, this.serviceType, id, pwd); resultCode = checkBind(memberDto, this.serviceType, id, pwd);
@ -432,9 +432,9 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
boolean isPermit = false; boolean isPermit = false;
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
saveSystemLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP()); saveLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP());
saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
isPermit = true; isPermit = true;
} }
@ -465,7 +465,7 @@ public class CollectReadTask implements Callable<ConnectUserDto> {
} }
try { try {
saveSystemLog("[BIND RESULT : " + resultCode + "]"); saveLog("[BIND RESULT : " + resultCode + "]");
channel.write(Bind.makeBindAckBuffer(resultCode)); channel.write(Bind.makeBindAckBuffer(resultCode));
if ("00".equals(resultCode) == false) { if ("00".equals(resultCode) == false) {
expireConnectUser(); expireConnectUser();

38
src/main/java/com/munjaon/server/server/task/CollectServerTask.java
View File

@ -58,9 +58,9 @@ public class CollectServerTask extends Thread {
this.serviceType = serviceType; this.serviceType = serviceType;
this.logger = logger; this.logger = logger;
if (connectUserDto.isLogin()) { if (connectUserDto.isLogin()) {
saveSystemLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]"); saveLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]");
} else { } else {
saveSystemLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]"); saveLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
} }
} }
@ -120,7 +120,7 @@ public class CollectServerTask extends Thread {
@Override @Override
public void run() { public void run() {
saveSystemLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); saveLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]");
/* 0. 최초 RUN Flag 체크 */ /* 0. 최초 RUN Flag 체크 */
reloadRunFlag(); reloadRunFlag();
/* BIND 체크 및 처리 */ /* BIND 체크 및 처리 */
@ -132,9 +132,9 @@ public class CollectServerTask extends Thread {
try { try {
/* 2. Packet Timeout Check */ /* 2. Packet Timeout Check */
if (checkTimeOut()) { if (checkTimeOut()) {
saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]");
expireConnectUser(); expireConnectUser();
saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
break; break;
} }
/* 3. HeadBuffer 읽기 */ /* 3. HeadBuffer 읽기 */
@ -160,7 +160,7 @@ public class CollectServerTask extends Thread {
/* 세션 만료 여부 */ /* 세션 만료 여부 */
this.isExpiredYn = true; this.isExpiredYn = true;
this.IS_ERROR = true; this.IS_ERROR = true;
saveSystemLog(e); saveLog(e);
} }
/* RUN Flag 체크 */ /* RUN Flag 체크 */
reloadRunFlag(); reloadRunFlag();
@ -171,7 +171,7 @@ public class CollectServerTask extends Thread {
if (IS_ERROR) { if (IS_ERROR) {
expireConnectUser(); expireConnectUser();
} }
saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
} }
private boolean checkTimeOut() { private boolean checkTimeOut() {
@ -186,7 +186,7 @@ public class CollectServerTask extends Thread {
/* 서비스 중지여부 체크 */ /* 서비스 중지여부 체크 */
if (isExpireService()) { if (isExpireService()) {
expireConnectUser(); expireConnectUser();
saveSystemLog(printTaskLog() + "[isExpireService : Expired ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[isExpireService : Expired ... ... ... ... ... ... ...]");
return; return;
} }
switch (this.serviceType) { switch (this.serviceType) {
@ -357,7 +357,7 @@ public class CollectServerTask extends Thread {
} else if (i == 2) { } else if (i == 2) {
messageDto.setUserFileName03(imagePath + File.separator + fileName); messageDto.setUserFileName03(imagePath + File.separator + fileName);
} }
saveSystemLog(printTaskLog() + "[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog(printTaskLog() + "[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]");
} }
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
@ -419,7 +419,7 @@ public class CollectServerTask extends Thread {
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
saveSystemLog(printTaskLog() + "[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog(printTaskLog() + "[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
MemberDto savedMemberDto = null; MemberDto savedMemberDto = null;
@ -474,7 +474,7 @@ public class CollectServerTask extends Thread {
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
saveSystemLog(printTaskLog() + "[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog(printTaskLog() + "[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
MemberDto savedMemberDto = null; MemberDto savedMemberDto = null;
@ -506,9 +506,9 @@ public class CollectServerTask extends Thread {
} }
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
channel.read(bodyBuffer); channel.read(bodyBuffer);
saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]");
channel.write(LinkCheck.makeLinkCheckAckBuffer()); channel.write(LinkCheck.makeLinkCheckAckBuffer());
saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]");
connectUserDto.updateLastTrafficTime(); connectUserDto.updateLastTrafficTime();
} }
@ -522,7 +522,7 @@ public class CollectServerTask extends Thread {
String id = Bind.getBindId(bindBuffer); String id = Bind.getBindId(bindBuffer);
String pwd = Bind.getBindPwd(bindBuffer); String pwd = Bind.getBindPwd(bindBuffer);
saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); saveLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService(); MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService();
MemberDto memberDto = null; MemberDto memberDto = null;
@ -537,9 +537,9 @@ public class CollectServerTask extends Thread {
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
boolean isPermit = false; boolean isPermit = false;
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
saveSystemLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]"); saveLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]");
saveSystemLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]");
saveSystemLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]");
if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
isPermit = true; isPermit = true;
} }
@ -568,7 +568,7 @@ public class CollectServerTask extends Thread {
} }
try { try {
saveSystemLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); saveLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]");
channel.write(Bind.makeBindAckBuffer(resultCode)); channel.write(Bind.makeBindAckBuffer(resultCode));
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
/* BIND 성공인 경우 사용자 Pool에 저장 */ /* BIND 성공인 경우 사용자 Pool에 저장 */
@ -579,7 +579,7 @@ public class CollectServerTask extends Thread {
/* 모니터링 로그 */ /* 모니터링 로그 */
HealthCheckServer.saveMonitorLog("[COLLECT SERVER][SERVICE TYPE : " + this.serviceType + "][ID : " + connectUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]"); HealthCheckServer.saveMonitorLog("[COLLECT SERVER][SERVICE TYPE : " + this.serviceType + "][ID : " + connectUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]");
} catch (IOException e) { } catch (IOException e) {
saveSystemLog(e); saveLog(e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }

12
src/main/java/com/munjaon/server/server/task/ReportBindTask.java
View File

@ -63,7 +63,7 @@ public class ReportBindTask extends ReportTask {
if (svc != null) { if (svc != null) {
memberDto = svc.get(id); memberDto = svc.get(id);
} }
saveSystemLog("[" + this.taskName + "][BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); saveLog("[" + this.taskName + "][BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
/* Bind Check */ /* Bind Check */
resultCode = checkBind(memberDto, id, pwd); resultCode = checkBind(memberDto, id, pwd);
@ -71,9 +71,9 @@ public class ReportBindTask extends ReportTask {
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
boolean isPermit = false; boolean isPermit = false;
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
saveSystemLog("[" + this.taskName + "][REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); saveLog("[" + this.taskName + "][REMOTE IP : " + reportUserDto.getRemoteIP() + "]");
saveSystemLog("[" + this.taskName + "][ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); saveLog("[" + this.taskName + "][ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]");
saveSystemLog("[" + this.taskName + "][ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); saveLog("[" + this.taskName + "][ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]");
if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
isPermit = true; isPermit = true;
} }
@ -107,7 +107,7 @@ public class ReportBindTask extends ReportTask {
} }
try { try {
saveSystemLog("[" + this.taskName + "][BIND RESULT : " + resultCode + "]"); saveLog("[" + this.taskName + "][BIND RESULT : " + resultCode + "]");
channel.write(Bind.makeBindAckBuffer(resultCode)); channel.write(Bind.makeBindAckBuffer(resultCode));
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
/* BIND 성공인 경우 사용자 Pool에 저장 */ /* BIND 성공인 경우 사용자 Pool에 저장 */
@ -118,7 +118,7 @@ public class ReportBindTask extends ReportTask {
/* 모니터링 로그 */ /* 모니터링 로그 */
HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]"); HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]");
} catch (IOException e) { } catch (IOException e) {
saveSystemLog(e); saveLog(e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }

8
src/main/java/com/munjaon/server/server/task/ReportLinkCheckTask.java
View File

@ -32,7 +32,7 @@ public class ReportLinkCheckTask extends ReportTask {
if (reportUserDto.isAlive() == 2) { if (reportUserDto.isAlive() == 2) {
channel.write(LinkCheck.makeLinkCheckBuffer()); channel.write(LinkCheck.makeLinkCheckBuffer());
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND LINK CHECK ... ... ... ... ... ... ...]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND LINK CHECK ... ... ... ... ... ... ...]");
/* 패킷 전송 시간 체크위한 설정(3초간 유지) */ /* 패킷 전송 시간 체크위한 설정(3초간 유지) */
SEND_CYCLE_CHECK_TIME = System.currentTimeMillis(); SEND_CYCLE_CHECK_TIME = System.currentTimeMillis();
/* Packet 전송했는지 여부 */ /* Packet 전송했는지 여부 */
@ -55,13 +55,13 @@ public class ReportLinkCheckTask extends ReportTask {
} else if (size == 0) { } else if (size == 0) {
Thread.sleep(1); Thread.sleep(1);
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) { if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]");
expireConnectUser(); expireConnectUser();
this.isExpiredYn = true; this.isExpiredYn = true;
break; break;
} }
} else { } else {
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
expireConnectUser(); expireConnectUser();
throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
} }
@ -72,7 +72,7 @@ public class ReportLinkCheckTask extends ReportTask {
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
int size = channel.read(bodyBuffer); int size = channel.read(bodyBuffer);
if (size > 0) { if (size > 0) {
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]");
reportUserDto.updateLastTrafficTime(); reportUserDto.updateLastTrafficTime();
this.isPacketSendYn = false; this.isPacketSendYn = false;
} }

2
src/main/java/com/munjaon/server/server/task/ReportQueueTask.java
View File

@ -60,7 +60,7 @@ public class ReportQueueTask implements Runnable {
} else { } else {
builder.append(",").append(dto.getMsgId()); builder.append(",").append(dto.getMsgId());
} }
saveSystemLog("reportDto : " + dto.toString()); saveLog("reportDto : " + dto.toString());
reportQueue.pushReportToQueue(dto); reportQueue.pushReportToQueue(dto);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);

20
src/main/java/com/munjaon/server/server/task/ReportReadTask.java
View File

@ -76,7 +76,7 @@ public class ReportReadTask implements Callable<ReportUserDto> {
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
int size = channel.read(bodyBuffer); int size = channel.read(bodyBuffer);
if (size > 0) { if (size > 0) {
saveSystemLog("Recv link check"); saveLog("Recv link check");
reportUserDto.updateLastTrafficTime(); reportUserDto.updateLastTrafficTime();
} }
} catch (Exception e) { } catch (Exception e) {
@ -92,7 +92,7 @@ public class ReportReadTask implements Callable<ReportUserDto> {
return; return;
} }
saveSystemLog("recv report"); saveLog("recv report");
ReportQueue reportQueue = reportUserDto.getReportQueue(); ReportQueue reportQueue = reportUserDto.getReportQueue();
reportUserDto.updateLastTrafficTime(); reportUserDto.updateLastTrafficTime();
if (reportQueue != null) { if (reportQueue != null) {
@ -137,7 +137,7 @@ public class ReportReadTask implements Callable<ReportUserDto> {
if (svc != null) { if (svc != null) {
memberDto = svc.get(id); memberDto = svc.get(id);
} }
saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
/* Bind Check */ /* Bind Check */
resultCode = checkBind(memberDto, id, pwd); resultCode = checkBind(memberDto, id, pwd);
@ -145,9 +145,9 @@ public class ReportReadTask implements Callable<ReportUserDto> {
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
boolean isPermit = false; boolean isPermit = false;
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
saveSystemLog("connectUserDto.getRemoteIP() : " + reportUserDto.getRemoteIP()); saveLog("connectUserDto.getRemoteIP() : " + reportUserDto.getRemoteIP());
saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
isPermit = true; isPermit = true;
} }
@ -182,7 +182,7 @@ public class ReportReadTask implements Callable<ReportUserDto> {
} }
try { try {
saveSystemLog("Bind ResultCode : " + resultCode); saveLog("Bind ResultCode : " + resultCode);
channel.write(Bind.makeBindAckBuffer(resultCode)); channel.write(Bind.makeBindAckBuffer(resultCode));
if ("00".equals(resultCode) == false) { if ("00".equals(resultCode) == false) {
expireConnectUser(); expireConnectUser();
@ -202,8 +202,8 @@ public class ReportReadTask implements Callable<ReportUserDto> {
String id = Bind.getBindId(bindBuffer); String id = Bind.getBindId(bindBuffer);
String pwd = Bind.getBindPwd(bindBuffer); String pwd = Bind.getBindPwd(bindBuffer);
saveSystemLog("Bind id : " + id); saveLog("Bind id : " + id);
saveSystemLog("Bind pwd : " + pwd); saveLog("Bind pwd : " + pwd);
if (id == null || pwd == null) { if (id == null || pwd == null) {
resultCode = "50"; resultCode = "50";
} else { } else {
@ -237,7 +237,7 @@ public class ReportReadTask implements Callable<ReportUserDto> {
} }
try { try {
saveSystemLog("Bind ResultCode : " + resultCode); saveLog("Bind ResultCode : " + resultCode);
channel.write(Bind.makeBindAckBuffer(resultCode)); channel.write(Bind.makeBindAckBuffer(resultCode));
if ("00".equals(resultCode) == false) { if ("00".equals(resultCode) == false) {
expireConnectUser(); expireConnectUser();

12
src/main/java/com/munjaon/server/server/task/ReportResultTask.java
View File

@ -43,19 +43,19 @@ public class ReportResultTask extends ReportTask {
String command = Header.getCommand(headBuffer); String command = Header.getCommand(headBuffer);
switch (Integer.parseInt(command)) { switch (Integer.parseInt(command)) {
case 6 : recvReport(); break; case 6 : recvReport(); break;
default: saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][INVALID REQUEST][command : " + command + "]"); default: saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][INVALID REQUEST][command : " + command + "]");
expireConnectUser(); break; expireConnectUser(); break;
} }
} else if (size == 0) { } else if (size == 0) {
Thread.sleep(1); Thread.sleep(1);
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) { if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]");
expireConnectUser(); expireConnectUser();
this.isExpiredYn = true; this.isExpiredYn = true;
break; break;
} }
} else { } else {
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
expireConnectUser(); expireConnectUser();
throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]");
} }
@ -69,12 +69,12 @@ public class ReportResultTask extends ReportTask {
return; return;
} }
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT ACK ... ... ... ... ... ... ...]");
ReportQueue reportQueue = reportUserDto.getReportQueue(); ReportQueue reportQueue = reportUserDto.getReportQueue();
reportUserDto.updateLastTrafficTime(); reportUserDto.updateLastTrafficTime();
this.isPacketSendYn = false; this.isPacketSendYn = false;
if (reportQueue != null && this.reportDto != null) { if (reportQueue != null && this.reportDto != null) {
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT : " + this.reportDto.toString() + "]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT : " + this.reportDto.toString() + "]");
reportQueue.addReadCounter(); reportQueue.addReadCounter();
} }
} }
@ -89,7 +89,7 @@ public class ReportResultTask extends ReportTask {
if (reportDto == null) { if (reportDto == null) {
return; return;
} }
saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][REPORT SEND : " + reportDto.toString() + "]"); saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][REPORT SEND : " + reportDto.toString() + "]");
ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH); ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH);
Packet.setDefaultByte(reportBuffer); Packet.setDefaultByte(reportBuffer);
Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH); Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH);

48
src/main/java/com/munjaon/server/server/task/ReportServerTask.java
View File

@ -61,9 +61,9 @@ public class ReportServerTask extends Thread {
this.reportQueue = reportUserDto.getReportQueue(); this.reportQueue = reportUserDto.getReportQueue();
this.logger = logger; this.logger = logger;
if (reportUserDto.isLogin()) { if (reportUserDto.isLogin()) {
saveSystemLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]"); saveLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]");
} else { } else {
saveSystemLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]"); saveLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]");
} }
} }
@ -102,7 +102,7 @@ public class ReportServerTask extends Thread {
@Override @Override
public void run() { public void run() {
saveSystemLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); saveLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]");
/* 최초 RUN Flag 체크 */ /* 최초 RUN Flag 체크 */
reloadRunFlag(); reloadRunFlag();
try { try {
@ -116,9 +116,9 @@ public class ReportServerTask extends Thread {
} }
/* 2. Packet Timeout Check */ /* 2. Packet Timeout Check */
if (checkTimeOut()) { if (checkTimeOut()) {
saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]");
expireConnectUser(); expireConnectUser();
saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
break; break;
} }
@ -135,7 +135,7 @@ public class ReportServerTask extends Thread {
/* 세션 만료 여부 */ /* 세션 만료 여부 */
this.isExpiredYn = true; this.isExpiredYn = true;
this.IS_ERROR = true; this.IS_ERROR = true;
saveSystemLog(e); saveLog(e);
} }
/* 중요 : 사용자 Thread 실행모드 Off */ /* 중요 : 사용자 Thread 실행모드 Off */
reportUserDto.setRunningMode(false); reportUserDto.setRunningMode(false);
@ -143,7 +143,7 @@ public class ReportServerTask extends Thread {
if (IS_ERROR) { if (IS_ERROR) {
expireConnectUser(); expireConnectUser();
} }
saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]");
} }
private boolean checkTimeOut() { private boolean checkTimeOut() {
@ -217,7 +217,7 @@ public class ReportServerTask extends Thread {
if (svc != null) { if (svc != null) {
memberDto = svc.get(id); memberDto = svc.get(id);
} }
saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); saveLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
/* Bind Check */ /* Bind Check */
resultCode = checkBind(memberDto, id, pwd); resultCode = checkBind(memberDto, id, pwd);
@ -225,9 +225,9 @@ public class ReportServerTask extends Thread {
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
boolean isPermit = false; boolean isPermit = false;
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
saveSystemLog(printTaskLog() + "[REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); saveLog(printTaskLog() + "[REMOTE IP : " + reportUserDto.getRemoteIP() + "]");
saveSystemLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]");
saveSystemLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]");
if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
isPermit = true; isPermit = true;
} }
@ -257,11 +257,11 @@ public class ReportServerTask extends Thread {
} }
} catch (Exception e) { } catch (Exception e) {
resultCode = "10"; resultCode = "10";
saveSystemLog(e); saveLog(e);
} }
try { try {
saveSystemLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); saveLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]");
channel.write(Bind.makeBindAckBuffer(resultCode)); channel.write(Bind.makeBindAckBuffer(resultCode));
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
/* BIND 성공인 경우 사용자 Pool에 저장 */ /* BIND 성공인 경우 사용자 Pool에 저장 */
@ -272,7 +272,7 @@ public class ReportServerTask extends Thread {
/* 모니터링 로그 */ /* 모니터링 로그 */
HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]"); HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]");
} catch (IOException e) { } catch (IOException e) {
saveSystemLog(e); saveLog(e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ -305,7 +305,7 @@ public class ReportServerTask extends Thread {
switch (Integer.parseInt(command)) { switch (Integer.parseInt(command)) {
case 6 : recvReport(channel); break; case 6 : recvReport(channel); break;
case 8 : recvLinkCheck(channel); break; case 8 : recvLinkCheck(channel); break;
default: saveSystemLog(printTaskLog() + "[INVALID REQUEST][command : " + command + "]"); default: saveLog(printTaskLog() + "[INVALID REQUEST][command : " + command + "]");
expireConnectUser(); break; expireConnectUser(); break;
} }
/* 마지막 패킷 수신시간 체크 */ /* 마지막 패킷 수신시간 체크 */
@ -313,13 +313,13 @@ public class ReportServerTask extends Thread {
} else if (size == 0) { } else if (size == 0) {
Thread.sleep(1); Thread.sleep(1);
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) { if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
saveSystemLog(printTaskLog() + "[SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); saveLog(printTaskLog() + "[SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]");
expireConnectUser(); expireConnectUser();
this.isExpiredYn = true; this.isExpiredYn = true;
break; break;
} }
} else { } else {
saveSystemLog(printTaskLog() + "[recvInterest : size is zero]"); saveLog(printTaskLog() + "[recvInterest : size is zero]");
expireConnectUser(); expireConnectUser();
throw new IOException("[recvInterest : size is zero]"); throw new IOException("[recvInterest : size is zero]");
} }
@ -330,7 +330,7 @@ public class ReportServerTask extends Thread {
ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH);
int size = channel.read(bodyBuffer); int size = channel.read(bodyBuffer);
if (size > 0) { if (size > 0) {
saveSystemLog(printTaskLog() + "[RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]");
reportUserDto.updateLastTrafficTime(); reportUserDto.updateLastTrafficTime();
this.isPacketSendYn = false; this.isPacketSendYn = false;
} }
@ -343,12 +343,12 @@ public class ReportServerTask extends Thread {
return; return;
} }
saveSystemLog(printTaskLog() + "[RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[RECEIVE REPORT ACK ... ... ... ... ... ... ...]");
ReportQueue reportQueue = reportUserDto.getReportQueue(); ReportQueue reportQueue = reportUserDto.getReportQueue();
reportUserDto.updateLastTrafficTime(); reportUserDto.updateLastTrafficTime();
this.isPacketSendYn = false; this.isPacketSendYn = false;
if (reportQueue != null && this.reportDto != null) { if (reportQueue != null && this.reportDto != null) {
saveSystemLog(printTaskLog() + "[RECEIVE REPORT : " + this.reportDto.toString() + "]"); saveLog(printTaskLog() + "[RECEIVE REPORT : " + this.reportDto.toString() + "]");
reportQueue.addReadCounter(); reportQueue.addReadCounter();
} }
} }
@ -359,7 +359,7 @@ public class ReportServerTask extends Thread {
} }
if (reportUserDto.isAlive() == 2) { if (reportUserDto.isAlive() == 2) {
channel.write(LinkCheck.makeLinkCheckBuffer()); channel.write(LinkCheck.makeLinkCheckBuffer());
saveSystemLog(printTaskLog() + "[SEND LINK CHECK ... ... ... ... ... ... ...]"); saveLog(printTaskLog() + "[SEND LINK CHECK ... ... ... ... ... ... ...]");
SEND_CYCLE_CHECK_TIME = System.currentTimeMillis(); SEND_CYCLE_CHECK_TIME = System.currentTimeMillis();
/* Packet 전송했는지 여부 */ /* Packet 전송했는지 여부 */
isPacketSendYn = true; isPacketSendYn = true;
@ -369,7 +369,7 @@ public class ReportServerTask extends Thread {
if (reportDto == null) { if (reportDto == null) {
return; return;
} }
saveSystemLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]"); saveLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]");
ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH); ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH);
Packet.setDefaultByte(reportBuffer); Packet.setDefaultByte(reportBuffer);
Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH); Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH);
@ -388,7 +388,7 @@ public class ReportServerTask extends Thread {
} }
try { try {
SocketChannel channel = (SocketChannel) key.channel(); SocketChannel channel = (SocketChannel) key.channel();
saveSystemLog("[ReportServerTask]Expire connect user: " + reportUserDto); saveLog("[ReportServerTask]Expire connect user: " + reportUserDto);
if (reportUserDto != null) { if (reportUserDto != null) {
if (reportUserDto.getUserId() != null) { if (reportUserDto.getUserId() != null) {
reportUserQueue.removeUser(reportUserDto.getUserId()); reportUserQueue.removeUser(reportUserDto.getUserId());
@ -404,7 +404,7 @@ public class ReportServerTask extends Thread {
// 키 닫기 // 키 닫기
key.cancel(); key.cancel();
} catch (IOException e) { } catch (IOException e) {
saveSystemLog(e); saveLog(e);
} }
} }

30
src/main/java/com/munjaon/server/server/task/SendReadTask.java
View File

@ -99,7 +99,7 @@ public class SendReadTask implements Runnable {
private boolean isExpireService() { private boolean isExpireService() {
ConnectUserDto checkConnectUserDto = collectUserQueue.getUser(this.serviceType, this.connectUserDto.getUserId()); ConnectUserDto checkConnectUserDto = collectUserQueue.getUser(this.serviceType, this.connectUserDto.getUserId());
MemberDto memberDto = checkConnectUserDto.getMemberDto(); MemberDto memberDto = checkConnectUserDto.getMemberDto();
saveSystemLog("[isExpireService : " + memberDto.toString() + "]"); saveLog("[isExpireService : " + memberDto.toString() + "]");
if (memberDto == null) { if (memberDto == null) {
return true; return true;
} }
@ -171,7 +171,7 @@ public class SendReadTask implements Runnable {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice()));
} }
saveSystemLog("[SMS] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[SMS] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("SMS"); QueueTypeWorker worker = QueueTypeWorker.find("SMS");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -203,7 +203,7 @@ public class SendReadTask implements Runnable {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice()));
} }
saveSystemLog("[LMS] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[LMS] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("LMS"); QueueTypeWorker worker = QueueTypeWorker.find("LMS");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -251,7 +251,7 @@ public class SendReadTask implements Runnable {
} else if (i == 2) { } else if (i == 2) {
messageDto.setUserFileName03(imagePath + File.separator + fileName); messageDto.setUserFileName03(imagePath + File.separator + fileName);
} }
saveSystemLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]");
} }
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
@ -272,7 +272,7 @@ public class SendReadTask implements Runnable {
messageDto.setUnitCost(String.valueOf(mmsPrice)); messageDto.setUnitCost(String.valueOf(mmsPrice));
} }
saveSystemLog("[MMS] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[MMS] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("MMS"); QueueTypeWorker worker = QueueTypeWorker.find("MMS");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -312,7 +312,7 @@ public class SendReadTask implements Runnable {
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
saveSystemLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
MemberDto savedMemberDto = null; MemberDto savedMemberDto = null;
@ -324,13 +324,13 @@ public class SendReadTask implements Runnable {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice()));
} }
saveSystemLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("KAT"); QueueTypeWorker worker = QueueTypeWorker.find("KAT");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus())); channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus()));
} else { } else {
saveSystemLog("worker is null"); saveLog("worker is null");
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -366,7 +366,7 @@ public class SendReadTask implements Runnable {
JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer);
messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName);
saveSystemLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); saveLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]");
/* 사용자 단가, 발송망 설정 */ /* 사용자 단가, 발송망 설정 */
MemberDto savedMemberDto = null; MemberDto savedMemberDto = null;
@ -378,7 +378,7 @@ public class SendReadTask implements Runnable {
messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice())); messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice()));
} }
saveSystemLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]"); saveLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]");
QueueTypeWorker worker = QueueTypeWorker.find("KFT"); QueueTypeWorker worker = QueueTypeWorker.find("KFT");
if (worker != null) { if (worker != null) {
worker.pushQueue(messageDto); worker.pushQueue(messageDto);
@ -417,7 +417,7 @@ public class SendReadTask implements Runnable {
if (svc != null) { if (svc != null) {
memberDto = svc.get(id); memberDto = svc.get(id);
} }
saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]");
/* Bind Check */ /* Bind Check */
resultCode = checkBind(memberDto, this.serviceType, id, pwd); resultCode = checkBind(memberDto, this.serviceType, id, pwd);
@ -425,9 +425,9 @@ public class SendReadTask implements Runnable {
if ("00".equals(resultCode)) { if ("00".equals(resultCode)) {
boolean isPermit = false; boolean isPermit = false;
if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) {
saveSystemLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP()); saveLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP());
saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic());
saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend());
if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) {
isPermit = true; isPermit = true;
} }
@ -458,7 +458,7 @@ public class SendReadTask implements Runnable {
} }
try { try {
saveSystemLog("[BIND RESULT : " + resultCode + "]"); saveLog("[BIND RESULT : " + resultCode + "]");
channel.write(Bind.makeBindAckBuffer(resultCode)); channel.write(Bind.makeBindAckBuffer(resultCode));
if ("00".equals(resultCode) == false) { if ("00".equals(resultCode) == false) {
expireConnectUser(); expireConnectUser();

14
src/main/java/com/munjaon/server/server/task/StatusCheckTask.java
View File

@ -27,28 +27,28 @@ public class StatusCheckTask implements Runnable {
@Override @Override
public void run() { public void run() {
saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]"); saveLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]");
List<ConnectUserDto> userList = collectUserQueue.getUsers(this.serviceType); List<ConnectUserDto> userList = collectUserQueue.getUsers(this.serviceType);
if (userList == null || userList.isEmpty()) { if (userList == null || userList.isEmpty()) {
saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]"); saveLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]");
saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]"); saveLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
return; return;
} }
MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService(); MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService();
for (ConnectUserDto user : userList) { for (ConnectUserDto user : userList) {
MemberDto savedMemberDto = user.getMemberDto(); MemberDto savedMemberDto = user.getMemberDto();
saveSystemLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]"); saveLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]");
MemberDto newMemberDto = svc.get(savedMemberDto.getMberId()); MemberDto newMemberDto = svc.get(savedMemberDto.getMberId());
saveSystemLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]"); saveLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]");
if (newMemberDto == null) { if (newMemberDto == null) {
savedMemberDto.setMberSttus("N"); savedMemberDto.setMberSttus("N");
} else { } else {
user.setMemberDto(newMemberDto); user.setMemberDto(newMemberDto);
} }
saveSystemLog("[" + this.serviceType + "][USER AFTER STATUS : " + savedMemberDto.toString() + "]"); saveLog("[" + this.serviceType + "][USER AFTER STATUS : " + savedMemberDto.toString() + "]");
} }
saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]"); saveLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]");
} }
private void saveSystemLog(Object obj) { private void saveSystemLog(Object obj) {