loki相关代码整理

3 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/net/geedge/confagent/controller/LokiController.java b/src/main/java/net/geedge/confagent/controller/LokiController.java
index e981e1e..667d78a 100644
--- a/src/main/java/net/geedge/confagent/controller/LokiController.java
+++ b/src/main/java/net/geedge/confagent/controller/LokiController.java
@@ -88,6 +88,8 @@ public class LokiController extends BaseController{
             	Tool.RuntimeUtil.exec(startCmd);
             	log.info("start loki:"+startCmd+"  end");
             }
+        }else {
+        	return R.error(RCode.LOKI_CONFIG_ISNULL);
         }
 
         return R.ok();
@@ -101,10 +103,10 @@ public class LokiController extends BaseController{
      @GetMapping("/config")
      public R queryConfig(HttpServletRequest request){
 
-         Map<String,Object> prometheusConf = Tool.YamlUtil.readAsMap(lokiConfPath);
+         Map<String,Object> lokiConf = Tool.YamlUtil.readAsMap(lokiConfPath);
          
          Map<String,Object> result = new HashMap<>();
-         result.put("config",prometheusConf);
+         result.put("config",lokiConf);
 
          return R.ok(result);
      }
@@ -256,8 +258,6 @@ public class LokiController extends BaseController{
                 List<String> value = en.getValue();
                 ReflectUtil.invoke(response,"addHeader",key,Tool.StrUtil.join("; ",value));
             }
-            ReflectUtil.invoke(response,"addHeader","Authorization",token);
-            // response.setStatus(responseCode, responseMessage);
             ReflectUtil.invoke(response, "setStatus", responseCode, responseMessage);
 
             Tool.IoUtil.copy(connInputStream, resOutputStream);
diff --git a/src/main/java/net/geedge/confagent/thread/RequestThread.java b/src/main/java/net/geedge/confagent/thread/RequestThread.java
index eec6a48..20fb509 100644
--- a/src/main/java/net/geedge/confagent/thread/RequestThread.java
+++ b/src/main/java/net/geedge/confagent/thread/RequestThread.java
@@ -10,7 +10,6 @@ import java.util.Map;
 import java.util.concurrent.Callable;

 

 import javax.servlet.ServletInputStream;

-import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

diff --git a/src/main/java/net/geedge/confagent/util/RCode.java b/src/main/java/net/geedge/confagent/util/RCode.java
index 4b77eb9..2a9fd1f 100644
--- a/src/main/java/net/geedge/confagent/util/RCode.java
+++ b/src/main/java/net/geedge/confagent/util/RCode.java
@@ -14,7 +14,11 @@ public enum RCode {
 	CONFIG_SNMP_EXPORTER_RELOAD_FAILED(10007,"Reload snmp_exporter failed"),
 	
 	LOKI_PUSH_URL_ISNULL(10108,"The token or target is required"),
+	LOKI_CONFIG_ISNULL(10109,"The loki config is required"),
+//	LOKI_PUSH_URL_FILE_NOT_EXIST(10109,"The lokiPushUrls file does not exist"),
 
+	CORTEX_CONFIG_ISNULL(10110,"The cortex config is required"),
+	
     ERROR(999, "error"); //通用错误/未知错误
 	private RCode(Integer code, String msg) {
 		this.code = code;