commit

@@ -17,31 +17,31 @@ import java.io.IOException;
 public class ETLAppDebug {
 
     public static void main(String[] args) throws Exception{
-//        System.setProperty("HADOOP_USER_NAME","test");
+        System.setProperty("HADOOP_USER_NAME","test");
         Configuration configuration = new Configuration();
-//        configuration.set("fs.defaultFS","hdfs://localhost:8020");
+        configuration.set("fs.defaultFS","hdfs://localhost:8020");
 
         FileSystem fileSystem = FileSystem.get(configuration);
-//        Path outputPath = new Path(args[1]);
-        Path outputPath = new Path("./input/etl");
+        Path outputPath = new Path(args[1]);
+//        Path outputPath = new Path("./input/etl");
         if(fileSystem.exists(outputPath)) {
             fileSystem.delete(outputPath,true);
         }
 
         Job job = Job.getInstance(configuration);
         job.setJarByClass(ETLAppDebug.class);
-        job.addArchiveToClassPath(new Path("./input/data/fastjson-1.2.79.jar"));
-//        job.addArchiveToClassPath(new Path("/jar/fastjson-1.2.79.jar"));
+//        job.addArchiveToClassPath(new Path("./input/data/fastjson-1.2.79.jar"));
+        job.addArchiveToClassPath(new Path("/jar/fastjson-1.2.79.jar"));
 
         job.setMapperClass(MyMapper.class);
 
         job.setMapOutputKeyClass(NullWritable.class);
         job.setMapOutputValueClass(Text.class);
 
-//        FileInputFormat.setInputPaths(job, new Path(args[0]));
-//        FileOutputFormat.setOutputPath(job, new Path(args[1]));
-        FileInputFormat.setInputPaths(job, new Path("./input/data/app.out"));
-        FileOutputFormat.setOutputPath(job, new Path("./input/etl"));
+        FileInputFormat.setInputPaths(job, new Path(args[0]));
+        FileOutputFormat.setOutputPath(job, new Path(args[1]));
+//        FileInputFormat.setInputPaths(job, new Path("./input/data/app.out"));
+//        FileOutputFormat.setOutputPath(job, new Path("./input/etl"));
 
         job.waitForCompletion(true);
     }
@@ -66,44 +66,40 @@ public class ETLAppDebug {
             if(StringUtil.isMessyCode(log)) {
                 rest = "messy";
             } else {
-                JSONObject obj = JSONObject.parseObject(log);
-
-                timestamp = obj.getString("timestamp");
+                timestamp = "";
+                rest = "";
+                trace = "";
+                if(log != null && log.contains("com.brty.gateway.filters.groovy.LoggerPostFilter")) {
+                    String[] split_log = log.split("] \\[");
+                    if(split_log != null && split_log.length == 11) {
+                        rest = "ok";
+                        if(split_log[0] != null) {
+                            String[] timechar = split_log[0].split(" INFO \\[http");
+                            if(timechar != null && timechar.length == 2) {
+                                timestamp = timechar[0];
                                 timestamp = StringUtil.format(timestamp);
                                 if(StringUtil.isMessyCode(timestamp)) {
                                     timestamp = "";
                                 }
-                rest = obj.getString("rest");
-                rest = StringUtil.format(rest);
-                if(StringUtil.isMessyCode(rest)) {
-                    rest = "";
                             }
-                trace = obj.getString("trace");
-                trace = StringUtil.format(trace);
-                if(StringUtil.isMessyCode(trace)) {
-                    trace = "";
                         }
-
-                String[] split_rest = rest.split("] \\[");
-                if(split_rest != null && split_rest.length == 11) {
-                    rest = "ok";
-                    requestUri = split_rest[2] != null ? split_rest[2].replace("requestUri:","") : StringUtil.isNull;
+                        requestUri = split_log[2] != null ? split_log[2].replace("requestUri:","") : StringUtil.isNull;
                         requestUri = StringUtil.format(requestUri);
                         if(StringUtil.isMessyCode(requestUri)) {
                             requestUri = "";
                         }
-                    status = split_rest[5] != null ? split_rest[5].replace("status:","") : StringUtil.isNull;
+                        status = split_log[5] != null ? split_log[5].replace("status:","") : StringUtil.isNull;
                         status = StringUtil.format(status);
                         if(StringUtil.isMessyCode(status)) {
                             status = "";
                         }
-                    request = split_rest[8] != null ? split_rest[8].replace("request:","") : StringUtil.isNull;
+                        request = split_log[8] != null ? split_log[8].replace("request:","") : StringUtil.isNull;
                         request = StringUtil.format(request);
                         if(StringUtil.isMessyCode(request)) {
                             request = "messy";
                             status = "messy";
                         }
-                    response = split_rest[9] != null ? split_rest[9].replace("response:","") : StringUtil.isNull;
+                        response = split_log[9] != null ? split_log[9].replace("response:","") : StringUtil.isNull;
                         response = StringUtil.format(response);
                         if(StringUtil.isMessyCode(response)) {
                             response = "";
@@ -136,6 +132,7 @@ public class ETLAppDebug {
                         }
                     }
                 }
+            }
 
             StringBuilder builder = new StringBuilder();
             builder.append(rest).append("\t");