潘钊 / bsth_control · Commits

Commit 8f1065e2d121eb1ab5287ffc766293e5bbd48101

Authored by 潘钊
1 parent 6b4e6d80

update...

Inline Side-by-side
Showing 2 changed files with 29 additions and 0 deletions
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
  View file @8f1065e
@@ -10,6 +10,7 @@ import com.bsth.data.gpsdata.recovery.GpsDataRecovery; @@ -10,6 +10,7 @@ import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
10 import com.bsth.util.ConfigUtil; 10 import com.bsth.util.ConfigUtil;
11 import org.apache.commons.lang3.StringUtils; 11 import org.apache.commons.lang3.StringUtils;
12 import org.apache.http.HttpEntity; 12 import org.apache.http.HttpEntity;
  13 +import org.apache.http.client.config.RequestConfig;
13 import org.apache.http.client.methods.CloseableHttpResponse; 14 import org.apache.http.client.methods.CloseableHttpResponse;
14 import org.apache.http.client.methods.HttpGet; 15 import org.apache.http.client.methods.HttpGet;
15 import org.apache.http.impl.client.CloseableHttpClient; 16 import org.apache.http.impl.client.CloseableHttpClient;
@@ -69,6 +70,11 @@ public class GpsDataLoaderThread extends Thread { @@ -69,6 +70,11 @@ public class GpsDataLoaderThread extends Thread {
69 try { 70 try {
70 httpClient = HttpClients.createDefault(); 71 httpClient = HttpClients.createDefault();
71 HttpGet get = new HttpGet(url); 72 HttpGet get = new HttpGet(url);
  73 + //超时时间
  74 + RequestConfig requestConfig = RequestConfig.custom()
  75 + .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
  76 + .setSocketTimeout(2000).build();
  77 + get.setConfig(requestConfig);
72 78
73 response = httpClient.execute(get); 79 response = httpClient.execute(get);
74 80
@@ -107,6 +113,7 @@ public class GpsDataLoaderThread extends Thread { @@ -107,6 +113,7 @@ public class GpsDataLoaderThread extends Thread {
107 gps.setNbbm(nbbm); 113 gps.setNbbm(nbbm);
108 //有更新的点位 114 //有更新的点位
109 updateList.add(gps); 115 updateList.add(gps);
  116 + logger.info("全量点："+ list.size() +"，更新点" + updateList.size());
110 } 117 }
111 //分析数据 118 //分析数据
112 gpsRealAnalyse.analyse(updateList); 119 gpsRealAnalyse.analyse(updateList);
src/main/resources/logback.xml
  View file @8f1065e
@@ -155,6 +155,28 @@ @@ -155,6 +155,28 @@
155 <appender-ref ref="DATATOOLS" /> 155 <appender-ref ref="DATATOOLS" />
156 </logger> 156 </logger>
157 157
  158 +
  159 + <!-- gps -->
  160 + <appender name="GPS_COUNT"
  161 + class="ch.qos.logback.core.rolling.RollingFileAppender">
  162 + <file>${LOG_BASE}/gps/count.log</file>
  163 + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  164 + <fileNamePattern>${LOG_BASE}/gps_count/gateway-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  165 + <timeBasedFileNamingAndTriggeringPolicy
  166 + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
  167 + <maxFileSize>100MB</maxFileSize>
  168 + </timeBasedFileNamingAndTriggeringPolicy>
  169 + </rollingPolicy>
  170 +
  171 + <layout class="ch.qos.logback.classic.PatternLayout">
  172 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
  173 + </pattern>
  174 + </layout>
  175 + </appender>
  176 + <logger name="com.bsth.data.gpsdata.thread.GpsDataLoaderThread"
  177 + level="INFO" additivity="false">
  178 + <appender-ref ref="GPS_COUNT" />
  179 + </logger>
158 <!--<logger name="org.hibernate.SQL" level="TRACE">--> 180 <!--<logger name="org.hibernate.SQL" level="TRACE">-->
159 <!--<appender-ref ref="STDOUT" />--> 181 <!--<appender-ref ref="STDOUT" />-->
160 <!--</logger>--> 182 <!--</logger>-->