From b7d9adc1a875ba9105b9d40c5579a8bf89a9a427 Mon Sep 17 00:00:00 2001
From: wuzewu <wuzewu@baidu.com>
Date: Fri, 6 Nov 2020 18:30:48 +0800
Subject: [PATCH] Add server_check

---
 paddlehub/__init__.py             |  1 +
 paddlehub/commands/config.py      |  2 +-
 paddlehub/server/__init__.py      | 17 ++++++++++++++---
 paddlehub/server/server_source.py |  3 +++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/paddlehub/__init__.py b/paddlehub/__init__.py
index 84981a6b..1e105e31 100644
--- a/paddlehub/__init__.py
+++ b/paddlehub/__init__.py
@@ -22,6 +22,7 @@ __version__ = '2.0.0-alpha0'
 from paddlehub.config import config
 from paddlehub.utils import log, parser, utils
 from paddlehub.utils.paddlex import download, ResourceNotFoundError
+from paddlehub.server import server_check
 from paddlehub.server.server_source import ServerConnectionError
 from paddlehub.module import Module
 from paddlehub.text.bert_tokenizer import BertTokenizer
diff --git a/paddlehub/commands/config.py b/paddlehub/commands/config.py
index e6870368..948cbb68 100644
--- a/paddlehub/commands/config.py
+++ b/paddlehub/commands/config.py
@@ -51,7 +51,7 @@ class ConfigCommand:
                 hubconf.reset()
                 print(hubconf)
             elif arg.startswith("server=="):
-                hubconf.server_url = arg.split("==")[1]
+                hubconf.server = arg.split("==")[1]
             elif arg.startswith("log.level=="):
                 hubconf.log_level = arg.split("==")[1]
             elif arg.startswith("log.enable=="):
diff --git a/paddlehub/server/__init__.py b/paddlehub/server/__init__.py
index c5e20a76..5ef3d828 100644
--- a/paddlehub/server/__init__.py
+++ b/paddlehub/server/__init__.py
@@ -13,6 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .server_source import ServerSource
-from .git_source import GitSource
-from .server import module_server
+from paddlehub.server.server_source import ServerSource
+from paddlehub.server.git_source import GitSource
+from paddlehub.server.server import module_server
+from paddlehub.utils import log
+
+
+def server_check() -> bool:
+    '''Check whether localhost can access the PaddleHub default server normally.'''
+    if module_server.get_source_by_key('default_hub_server').is_connected():
+        log.logger.info('Request Hub-Server successfully.')
+        return True
+
+    log.logger.info('Request Hub-Server unsuccessfully.')
+    return False
diff --git a/paddlehub/server/server_source.py b/paddlehub/server/server_source.py
index a47bce33..3ea28562 100644
--- a/paddlehub/server/server_source.py
+++ b/paddlehub/server/server_source.py
@@ -119,6 +119,9 @@ class ServerSource(object):
         except requests.exceptions.ConnectionError as e:
             raise ServerConnectionError(self._url)
 
+    def is_connected(self):
+        return self.check(self._url)
+
     @classmethod
     def check(cls, url: str) -> bool:
         '''
-- 
GitLab