[dubbo-php-framework] 03/31: add composer.json and apache/log4php replace log4php/Logger.php

[wa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-php-framework.git

commit 07fae4a1cbee26307c36f27a62ac9bac694c63ff
Author: kilmas <ki...@qq.com>
AuthorDate: Fri Jun 29 13:24:05 2018 +0800

    add composer.json and apache/log4php replace log4php/Logger.php
---
 bin/app_admin.php          |  6 +++++-
 composer.json              |  5 +++++
 provider/shell/StartUp.php | 10 ++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/bin/app_admin.php b/bin/app_admin.php
index 13e6dc2..57b27bd 100644
--- a/bin/app_admin.php
+++ b/bin/app_admin.php
@@ -17,7 +17,11 @@
  *  limitations under the License.
  */
 
-require_once('log4php/Logger.php');
+define("BIN_DIR", __DIR__);
+define('MYROOT',BIN_DIR."/..");
+
+require_once MYROOT . '/vendor/autoload.php';
+require_once MYROOT . '/vendor/apache/log4php/src/main/php/Logger.php';
 
 use com\fenqile\fsof\common\config\FSOFConfigManager;
 
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..ef301f0
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "apache/log4php": "^2.3"
+    }
+}
diff --git a/provider/shell/StartUp.php b/provider/shell/StartUp.php
index fe9618c..65c9b93 100644
--- a/provider/shell/StartUp.php
+++ b/provider/shell/StartUp.php
@@ -17,8 +17,14 @@
  */
 namespace com\fenqile\fsof\provider\shell;
 
-require_once('log4php/Logger.php');
 use com\fenqile\fsof\common\config\FSOFConfigManager;
+use com\fenqile\fsof\provider\core\server\TcpServer;
+
+define("BIN_DIR", __DIR__);
+define('MYROOT',BIN_DIR."/../..");
+
+require_once MYROOT . '/vendor/autoload.php';
+require_once MYROOT . '/vendor/apache/log4php/src/main/php/Logger.php';
 
 // 定义provider shell目录
 define('FSOF_PROVIDER_SHELL_PATH', __DIR__);
@@ -56,7 +62,7 @@ if(isset($config['server']['log_cfg_file_path']) && !empty($config['server']['lo
 }
 
 \Logger::getLogger(__CLASS__)->info("input {$cmd} {$name}");
-$server = new \com\fenqile\fsof\provider\core\server\TcpServer($name);
+$server = new TcpServer($name);
 //加载app root目录下的bootstrap.php和provider/$name.provider文件
 $server->setRequire(FSOFConfigManager::getProviderAppRoot($name));