Merge pull request #28 from zenuo/fix_npe

Fix npe

Author: zenuo

gogo-server/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>zenuo</groupId>
     <artifactId>gogo</artifactId>
-    <version>1.7.6</version>
+    <version>1.7.7</version>
 
     <packaging>jar</packaging>
 
@@ -57,9 +57,24 @@
             <version>1.12.1</version>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j18-impl</artifactId>
+            <version>2.14.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.14.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

gogo-server/src/main/java/zenuo/gogo/core/processor/impl/GoogleSearchResultProviderImpl.java

@@ -45,22 +45,9 @@ public int priority() {
 
     @Override
     public SearchResponse search(String key, int page) throws SearchException {
-        return search0(key, page);
-    }
-
-    /**
-     * Get entries of google search0 result
-     *
-     * @param key  keyword
-     * @param page page number
-     * @return entries if succeed, null otherwise
-     */
-    SearchResponse search0(String key, int page) throws SearchException {
-        //builder
         final SearchResponse.SearchResponseBuilder builder = SearchResponse.builder();
         builder.key(key);
         builder.page(page);
-        //document
         final Document document;
         try {
             document = httpGet(key, page);
@@ -69,8 +56,9 @@ SearchResponse search0(String key, int page) throws SearchException {
             log.error(message, e);
             throw new SearchException(message, e);
         }
-        final Elements webResults = document.getElementsByClass("rc");
+        final Elements webResults = document.getElementsByClass("g");
         if (webResults.isEmpty()) {
+            log.error("pattern changed");
             return patternChanged(builder);
         }
         final List<Entry> entries = new ArrayList<>();
@@ -79,7 +67,7 @@ SearchResponse search0(String key, int page) throws SearchException {
             //entry builder
             final Entry.EntryBuilder entryBuilder = Entry.builder();
             //name
-            final Element name = result.getElementsByClass("LC20lb").first();
+            final Element name = result.getElementsByClass("LC20lb DKV0Md").first();
             if (name == null) {
                 continue;
             }

gogo-server/src/main/java/zenuo/gogo/core/processor/impl/SearchProcessorImpl.java

@@ -8,7 +8,6 @@
 import zenuo.gogo.core.ResponseType;
 import zenuo.gogo.core.processor.ISearchProcessor;
 import zenuo.gogo.core.processor.ISearchResultProvider;
-import zenuo.gogo.exception.SearchException;
 import zenuo.gogo.model.SearchResponse;
 import zenuo.gogo.service.ICacheService;
 import zenuo.gogo.util.JsonUtils;
@@ -49,12 +48,10 @@ public void process(ChannelHandlerContext ctx, FullHttpRequest request, QueryStr
                     HttpResponseStatus.BAD_REQUEST);
         } else {
             final List<String> pages = decoder.parameters().get("p");
-            //根据优先级调用提供者
             final String key = keys.get(0);
             final int page = pages == null || "".equals(pages.get(0)) ? 1 : Integer.parseInt(pages.get(0));
 
             SearchResponse response = null;
-            SearchException searchException = null;
 
             if (page < 1) {
                 response = SearchResponse.builder().error("page must be greater than zero!")
@@ -75,9 +72,8 @@ public void process(ChannelHandlerContext ctx, FullHttpRequest request, QueryStr
                                 // if response entries is not empty
                                 break;
                             }
-                        } catch (SearchException e) {
-                            //忽略
-                            searchException = e;
+                        } catch (Exception e) {
+                            log.error("exception {}", srp, e);
                         }
                     }
                     // cache
@@ -91,8 +87,8 @@ public void process(ChannelHandlerContext ctx, FullHttpRequest request, QueryStr
                 response(ctx,
                         request,
                         responseType,
-                        responseType == ResponseType.API ? ("{\"error\": \"" + searchException.getMessage() + "\"}").getBytes(StandardCharsets.UTF_8)
-                                : resultPageBuilder.build(SearchResponse.builder().key(key).error(searchException.getMessage()).build()),
+                        responseType == ResponseType.API ? ("{\"error\": \"try again later\"}").getBytes(StandardCharsets.UTF_8)
+                                : resultPageBuilder.build(SearchResponse.builder().key(key).error("try again later").build()),
                         HttpResponseStatus.OK);
 
             } else {

gogo-server/src/main/resources/META-INF/services/zenuo.gogo.core.processor.ISearchResultProvider

@@ -1,2 +1,2 @@
 zenuo.gogo.core.processor.impl.GoogleSearchResultProviderImpl
-zenuo.gogo.core.processor.impl.StartPageSearchResultProviderImpl
+

gogo-server/src/main/resources/log4j2.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+  <Properties>
+    <property name="PATTERN">%d [%t] %-5level %logger{36} - %msg%n</property>
+    <Property name="filename">./log/gogo.log</Property>
+  </Properties>
+ 
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="${PATTERN}"/>
+    </Console>
+
+    <RollingRandomAccessFile name="File" filePattern="${filename}.%d.log.gz">
+      <PatternLayout pattern="${PATTERN}"/>
+      <Policies>
+        <TimeBasedTriggeringPolicy />
+      </Policies>
+    </RollingRandomAccessFile>
+  </Appenders>
+ 
+  <Loggers>
+    <Root level="INFO">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="File"/>
+    </Root>
+
+    <AsyncLogger name="gogo" additivity="false">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="File"/>
+    </AsyncLogger>
+  </Loggers>
+ 
+</Configuration>

gogo-server/src/main/resources/logback.xml

@@ -28,15 +28,15 @@ public void request() throws IOException {
 
     @Test
     public void search() throws SearchException {
-        final SearchResponse response = searchResultProvider.search0("udp", 1);
+        final SearchResponse response = searchResultProvider.search("udp", 1);
         if (response.getEntries().isPresent()) {
             response.getEntries().get().forEach(e -> System.out.println(e.getName()));
         }
     }
 
     @Test
     public void response() throws SearchException {
-        final SearchResponse searchResponse = searchResultProvider.search0("udp", 2);
+        final SearchResponse searchResponse = searchResultProvider.search("udp", 2);
         final byte[] json = JsonUtils.toJsonBytes(searchResponse);
         System.out.println(Arrays.toString(json));
     }