implemented dev and production mode for logging
This commit is contained in:
@@ -4,7 +4,7 @@ import net.irext.decoder.alioss.OSSHelper;
|
|||||||
import net.irext.decoder.model.IRBinary;
|
import net.irext.decoder.model.IRBinary;
|
||||||
import net.irext.decoder.model.RemoteIndex;
|
import net.irext.decoder.model.RemoteIndex;
|
||||||
import net.irext.decoder.redisrepo.IIRBinaryRepository;
|
import net.irext.decoder.redisrepo.IIRBinaryRepository;
|
||||||
import net.irext.decoder.utils.FileUtils;
|
import net.irext.decoder.utils.FileUtil;
|
||||||
import net.irext.decoder.utils.MD5Util;
|
import net.irext.decoder.utils.MD5Util;
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -13,10 +13,8 @@ import org.springframework.stereotype.Controller;
|
|||||||
import javax.servlet.ServletContext;
|
import javax.servlet.ServletContext;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Filename: CollectCodeLogic
|
* Filename: CollectCodeLogic
|
||||||
@@ -117,8 +115,8 @@ public class DecodeLogic {
|
|||||||
String ossChecksum =
|
String ossChecksum =
|
||||||
MD5Util.byteArrayToHexString(MessageDigest.getInstance("MD5").digest(binaries)).toUpperCase();
|
MD5Util.byteArrayToHexString(MessageDigest.getInstance("MD5").digest(binaries)).toUpperCase();
|
||||||
if (ossChecksum.equals(checksum)) {
|
if (ossChecksum.equals(checksum)) {
|
||||||
FileUtils.createDirs(downloadPath);
|
FileUtil.createDirs(downloadPath);
|
||||||
if (FileUtils.write(binFile, binaries)) {
|
if (FileUtil.write(binFile, binaries)) {
|
||||||
return new FileInputStream(binFile);
|
return new FileInputStream(binFile);
|
||||||
} else {
|
} else {
|
||||||
System.out.println("fatal : write file to local path failed");
|
System.out.println("fatal : write file to local path failed");
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import net.irext.decoder.response.DecodeResponse;
|
|||||||
import net.irext.decoder.response.ServiceResponse;
|
import net.irext.decoder.response.ServiceResponse;
|
||||||
import net.irext.decoder.response.Status;
|
import net.irext.decoder.response.Status;
|
||||||
import net.irext.decoder.service.base.AbstractBaseService;
|
import net.irext.decoder.service.base.AbstractBaseService;
|
||||||
|
import net.irext.decoder.utils.LoggerUtil;
|
||||||
import net.irext.decodesdk.bean.ACStatus;
|
import net.irext.decodesdk.bean.ACStatus;
|
||||||
import net.irext.decodesdk.utils.Constants;
|
import net.irext.decodesdk.utils.Constants;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@@ -34,7 +35,7 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
@RequestMapping("/irext")
|
@RequestMapping("/irext")
|
||||||
public class IRDecodeService extends AbstractBaseService {
|
public class IRDecodeService extends AbstractBaseService {
|
||||||
|
|
||||||
Logger logger = LogManager.getLogger(IRDecodeService.class);
|
private static final String TAG = IRDecodeService.class.getSimpleName();
|
||||||
|
|
||||||
private RemoteIndexMapper remoteIndexMapper;
|
private RemoteIndexMapper remoteIndexMapper;
|
||||||
|
|
||||||
@@ -53,7 +54,7 @@ public class IRDecodeService extends AbstractBaseService {
|
|||||||
try {
|
try {
|
||||||
int remoteIndexId = openRequest.getRemoteIndexId();
|
int remoteIndexId = openRequest.getRemoteIndexId();
|
||||||
|
|
||||||
logger.trace("irOpen API called : " + remoteIndexId);
|
LoggerUtil.getInstance().trace(TAG,"irOpen API called : " + remoteIndexId);
|
||||||
|
|
||||||
ServiceResponse response = new ServiceResponse();
|
ServiceResponse response = new ServiceResponse();
|
||||||
RemoteIndex remoteIndex = IndexLogic.getInstance(remoteIndexMapper).getRemoteIndex(remoteIndexId);
|
RemoteIndex remoteIndex = IndexLogic.getInstance(remoteIndexMapper).getRemoteIndex(remoteIndexId);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package net.irext.decoder.utils;
|
|||||||
import java.io.*;
|
import java.io.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Filename: FileUtils.java
|
* Filename: FileUtil.java
|
||||||
* Revised: Date: 2017-04-14
|
* Revised: Date: 2017-04-14
|
||||||
* Revision: Revision: 1.0
|
* Revision: Revision: 1.0
|
||||||
* <p>
|
* <p>
|
||||||
@@ -12,7 +12,7 @@ import java.io.*;
|
|||||||
* Revision log:
|
* Revision log:
|
||||||
* 2017-04-14: created by strawmanbobi
|
* 2017-04-14: created by strawmanbobi
|
||||||
*/
|
*/
|
||||||
public class FileUtils {
|
public class FileUtil {
|
||||||
|
|
||||||
public static boolean write(File file, byte[] binaries) {
|
public static boolean write(File file, byte[] binaries) {
|
||||||
if (null == file) {
|
if (null == file) {
|
||||||
40
src/main/java/net/irext/decoder/utils/LoggerUtil.java
Normal file
40
src/main/java/net/irext/decoder/utils/LoggerUtil.java
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
package net.irext.decoder.utils;
|
||||||
|
|
||||||
|
import net.irext.decoder.service.IRDecodeService;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Filename: LoggerUtil.java
|
||||||
|
* Revised: Date: 2019-01-01
|
||||||
|
* Revision: Revision: 1.0
|
||||||
|
* <p>
|
||||||
|
* Description: Logging util
|
||||||
|
* <p>
|
||||||
|
* Revision log:
|
||||||
|
* 2019-01-01: created by strawmanbobi
|
||||||
|
*/
|
||||||
|
public class LoggerUtil {
|
||||||
|
private static LoggerUtil loggerUtil;
|
||||||
|
private Logger logger;
|
||||||
|
private static final int MODE = 0;
|
||||||
|
|
||||||
|
LoggerUtil() {
|
||||||
|
this.logger = LogManager.getLogger(LoggerUtil.class.getSimpleName());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LoggerUtil getInstance() {
|
||||||
|
if (null == loggerUtil) {
|
||||||
|
loggerUtil = new LoggerUtil();
|
||||||
|
}
|
||||||
|
return loggerUtil;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void trace(String tag, String log) {
|
||||||
|
if (0 == MODE) {
|
||||||
|
System.out.println("[" + tag + "] " + log);
|
||||||
|
} else {
|
||||||
|
this.logger.trace("[" + tag + "] " + log);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user