From a0a1357f0634151b16051186f895de71b1e18f70 Mon Sep 17 00:00:00 2001
From: nanshihui <nanshihui@qq.com>
Date: Thu, 13 Oct 2016 16:06:27 +0800
Subject: [PATCH] avoid timeout when fist set up connection

---
 .idea/workspace.xml                | 153 ++++++++++++++++-------------
 elasticsearchmanage/elastictool.py |   2 +-
 2 files changed, 85 insertions(+), 70 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2d70100..4a1e0a0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="54d03a85-8815-4b9f-9691-e63c71d3e22e" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/setup/environment.sh" afterPath="$PROJECT_DIR$/setup/environment.sh" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spidermanage/spidertool/redistool.py" afterPath="$PROJECT_DIR$/spidermanage/spidertool/redistool.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/spidermanage/spidertool/zmaptool.py" afterPath="$PROJECT_DIR$/spidermanage/spidertool/zmaptool.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/elasticsearchmanage/elastictool.py" afterPath="$PROJECT_DIR$/elasticsearchmanage/elastictool.py" />
     </list>
     <ignored path="Scan-T.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -72,46 +70,58 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="searchroute.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spidermanage/fontsearch/searchroute.py">
+      <file leaf-file-name="environment.sh" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/setup/environment.sh">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1890">
-              <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+            <state relative-caret-position="585">
+              <caret line="39" column="0" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="redistool.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/redistool.py">
+      <file leaf-file-name="zmaptool.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/zmaptool.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="525">
-              <caret line="35" column="23" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="23" />
+            <state relative-caret-position="15">
+              <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="environment.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/setup/environment.sh">
+      <file leaf-file-name="elastictool.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/elasticsearchmanage/elastictool.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="585">
-              <caret line="39" column="0" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
+            <state relative-caret-position="90">
+              <caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="zmaptool.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/zmaptool.py">
+      <file leaf-file-name="importmapping.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/elasticsearchmanage/importmapping.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-120">
-              <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
+            <state relative-caret-position="-2151">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="mapping.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/elasticsearchmanage/mapping.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" column="50" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
+              <folding>
+                <element signature="e#34#63#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="weblogic_2379ff4b3eb7712b2949f85115c62fce.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_2379ff4b3eb7712b2949f85115c62fce.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -127,7 +137,7 @@
       <file leaf-file-name="weblogic_ac3772ca531f22eae73ae999a683105c.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_ac3772ca531f22eae73ae999a683105c.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-585">
+            <state relative-caret-position="0">
               <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding>
                 <element signature="e#0#27#0" expanded="true" />
@@ -139,7 +149,7 @@
       <file leaf-file-name="weblogic_crackpass.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_crackpass.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-720">
+            <state relative-caret-position="0">
               <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
@@ -149,7 +159,7 @@
       <file leaf-file-name="weblogic_SSRF.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_SSRF.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-290">
+            <state relative-caret-position="0">
               <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding>
                 <element signature="e#0#27#0" expanded="true" />
@@ -161,25 +171,13 @@
       <file leaf-file-name="weblogic_unrec.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_unrec.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
+            <state relative-caret-position="675">
               <caret line="54" column="65" selection-start-line="54" selection-start-column="23" selection-end-line="54" selection-end-column="67" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="searchdetail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spidermanage/view/fontsearchview/searchdetail.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5010">
-              <caret line="334" column="33" selection-start-line="334" selection-start-column="33" selection-end-line="334" selection-end-column="33" />
-              <folding>
-                <marker date="1475988685923" expanded="true" signature="11037:11053" placeholder="..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -220,7 +218,6 @@
         <option value="$PROJECT_DIR$/spidermanage/spidertool/detection/httpdect/webdection/domaintool.py" />
         <option value="$PROJECT_DIR$/spidermanage/spidertool/detection/httpdect/webdection/getgeoipinfo.py" />
         <option value="$PROJECT_DIR$/spidermanage/nmaptoolbackground/model/ports.py" />
-        <option value="$PROJECT_DIR$/elasticsearchmanage/elastictool.py" />
         <option value="$PROJECT_DIR$/spidermanage/background/schedule.py" />
         <option value="$PROJECT_DIR$/spidermanage/background/taskcontrol.py" />
         <option value="$PROJECT_DIR$/spidermanage/background/taskitem.py" />
@@ -249,6 +246,7 @@
         <option value="$PROJECT_DIR$/spidermanage/spidertool/redistool.py" />
         <option value="$PROJECT_DIR$/setup/environment.sh" />
         <option value="$PROJECT_DIR$/spidermanage/spidertool/zmaptool.py" />
+        <option value="$PROJECT_DIR$/elasticsearchmanage/elastictool.py" />
       </list>
     </option>
   </component>
@@ -259,8 +257,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="105" />
-    <option name="y" value="50" />
+    <option name="x" value="97" />
+    <option name="y" value="61" />
     <option name="width" value="1221" />
     <option name="height" value="649" />
   </component>
@@ -289,7 +287,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
@@ -363,8 +360,23 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Scan-T" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Scan-T" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="elasticsearchmanage" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -724,12 +736,12 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="105" y="50" width="1221" height="649" extended-state="0" />
+    <frame x="97" y="61" width="1221" height="649" extended-state="0" />
     <editor active="false" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28419328" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30612245" sideWeight="0.50594354" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30426717" sideWeight="0.50594354" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -1025,13 +1037,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/elasticsearchmanage/importmapping.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/iptask.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2265">
@@ -1053,13 +1058,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/elasticsearchmanage/mapping.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="6" column="53" selection-start-line="6" selection-start-column="53" selection-end-line="6" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/test.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -1074,19 +1072,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/elasticsearchmanage/elastictool.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2295">
-          <caret line="153" column="29" selection-start-line="153" selection-start-column="29" selection-end-line="153" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/elasticsearchmanage/ipestool.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1126,7 +1115,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_ac3772ca531f22eae73ae999a683105c.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-585">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="e#0#27#0" expanded="true" />
@@ -1136,7 +1125,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_crackpass.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-720">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
@@ -1144,7 +1133,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_SSRF.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-290">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="e#0#27#0" expanded="true" />
@@ -1154,7 +1143,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/detection/vuldect/plugins/middileware/weblogic/weblogic_unrec.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
+        <state relative-caret-position="675">
           <caret line="54" column="65" selection-start-line="54" selection-start-column="23" selection-end-line="54" selection-end-column="67" />
           <folding />
         </state>
@@ -1172,11 +1161,37 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/spidermanage/spidertool/zmaptool.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-120">
+        <state relative-caret-position="15">
           <caret line="40" column="0" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/elasticsearchmanage/mapping.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="50" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
+          <folding>
+            <element signature="e#34#63#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/elasticsearchmanage/elastictool.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/elasticsearchmanage/importmapping.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2151">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/elasticsearchmanage/elastictool.py b/elasticsearchmanage/elastictool.py
index 09856f9..479244f 100644
--- a/elasticsearchmanage/elastictool.py
+++ b/elasticsearchmanage/elastictool.py
@@ -13,7 +13,7 @@
 import chardet
 logger = initLog('logs/elastic.log', 2, True)
 # Define a default Elasticsearch client
-# connections.create_connection(hosts=['localhost'])
+connections.create_connection(hosts=['localhost'])
 import base64
 def decodestr(msg):