Merge branch 'master' of github.com:cpp-main/cpp-tbox into develop

Author: hevake

modules/flow/action.cpp

@@ -37,7 +37,7 @@ Action::Action(event::Loop &loop, const std::string &type) :
 
 Action::~Action() {
   if (isUnderway()) {
-    LogWarn("action %d:%s(%s) is still underway, state:%s",
+    LogWarn("action %d:%s[%s] is still underway, state:%s",
             id_, type_.c_str(), label_.c_str(),
             ToString(state_).c_str());
   }
@@ -58,13 +58,13 @@ bool Action::start() {
     return true;
 
   if (state_ != State::kIdle) {
-    LogWarn("not allow");
+    LogWarn("not allow %d:%s[%s]", id_, type_.c_str(), label_.c_str());
     return false;
   }
 
-  LogDbg("start action %d:%s(%s)", id_, type_.c_str(), label_.c_str());
+  LogDbg("start action %d:%s[%s]", id_, type_.c_str(), label_.c_str());
   if (!onStart()) {
-    LogWarn("start action %d:%s(%s) fail", id_, type_.c_str(), label_.c_str());
+    LogWarn("start action %d:%s[%s] fail", id_, type_.c_str(), label_.c_str());
     return false;
   }
 
@@ -80,13 +80,13 @@ bool Action::pause() {
     return true;
 
   if (state_ != State::kRunning) {
-    LogWarn("not allow");
+    LogWarn("not allow %d:%s[%s]", id_, type_.c_str(), label_.c_str());
     return false;
   }
 
-  LogDbg("pause action %d:%s(%s)", id_, type_.c_str(), label_.c_str());
+  LogDbg("pause action %d:%s[%s]", id_, type_.c_str(), label_.c_str());
   if (!onPause()) {
-    LogWarn("pause action %d:%s(%s) fail", id_, type_.c_str(), label_.c_str());
+    LogWarn("pause action %d:%s[%s] fail", id_, type_.c_str(), label_.c_str());
     return false;
   }
 
@@ -102,13 +102,13 @@ bool Action::resume() {
     return true;
 
   if (state_ != State::kPause) {
-    LogWarn("not allow");
+    LogWarn("not allow %d:%s[%s]", id_, type_.c_str(), label_.c_str());
     return false;
   }
 
-  LogDbg("resume action %d:%s(%s)", id_, type_.c_str(), label_.c_str());
+  LogDbg("resume action %d:%s[%s]", id_, type_.c_str(), label_.c_str());
   if (!onResume()) {
-    LogWarn("resume action %d:%s(%s) fail", id_, type_.c_str(), label_.c_str());
+    LogWarn("resume action %d:%s[%s] fail", id_, type_.c_str(), label_.c_str());
     return false;
   }
 
@@ -124,9 +124,9 @@ bool Action::stop() {
       state_ != State::kPause)
     return true;
 
-  LogDbg("stop action %d:%s(%s)", id_, type_.c_str(), label_.c_str());
+  LogDbg("stop action %d:%s[%s]", id_, type_.c_str(), label_.c_str());
   if (!onStop()) {
-    LogWarn("stop action %d:%s(%s) fail", id_, type_.c_str(), label_.c_str());
+    LogWarn("stop action %d:%s[%s] fail", id_, type_.c_str(), label_.c_str());
     return false;
   }
 
@@ -141,7 +141,7 @@ void Action::reset() {
   if (state_ == State::kIdle)
     return;
 
-  LogDbg("reset action %d:%s(%s)", id_, type_.c_str(), label_.c_str());
+  LogDbg("reset action %d:%s[%s]", id_, type_.c_str(), label_.c_str());
   onReset();
 
   if (timer_ev_ != nullptr)
@@ -152,13 +152,13 @@ void Action::reset() {
 }
 
 void Action::setTimeout(std::chrono::milliseconds ms) {
-  LogDbg("set action %d:%s(%s) timeout: %d", id_, type_.c_str(), label_.c_str(), ms.count());
+  LogDbg("set action %d:%s[%s] timeout: %d", id_, type_.c_str(), label_.c_str(), ms.count());
 
   if (timer_ev_ == nullptr) {
     timer_ev_ = loop_.newTimerEvent("Action::timer_ev_");
     timer_ev_->setCallback(
       [this] {
-        LogDbg("action %d:%s(%s) timeout", id_, type_.c_str(), label_.c_str());
+        LogDbg("action %d:%s[%s] timeout", id_, type_.c_str(), label_.c_str());
         onTimeout();
       }
     );
@@ -172,7 +172,7 @@ void Action::setTimeout(std::chrono::milliseconds ms) {
 }
 
 void Action::resetTimeout() {
-  LogDbg("reset action %d:%s(%s) timeout", id_, type_.c_str(), label_.c_str());
+  LogDbg("reset action %d:%s[%s] timeout", id_, type_.c_str(), label_.c_str());
 
   if (timer_ev_ != nullptr) {
     auto tobe_delete = timer_ev_;
@@ -185,7 +185,7 @@ void Action::resetTimeout() {
 
 bool Action::finish(bool is_succ) {
   if (state_ != State::kFinished) {
-    LogDbg("action %d:%s(%s) finished, is_succ: %s", id_, type_.c_str(), label_.c_str(),
+    LogDbg("action %d:%s[%s] finished, is_succ: %s", id_, type_.c_str(), label_.c_str(),
             (is_succ? "succ" : "fail"));
     state_ = State::kFinished;
 
@@ -197,13 +197,13 @@ bool Action::finish(bool is_succ) {
     if (finish_cb_)
         loop_.runNext(std::bind(finish_cb_, is_succ), "Action::finish");
     else
-        LogWarn("action %d:%s(%s) no finish_cb", id_, type_.c_str(), label_.c_str());
+        LogWarn("action %d:%s[%s] no finish_cb", id_, type_.c_str(), label_.c_str());
 
     onFinished(is_succ);
     return true;
 
   } else {
-    LogWarn("not allow");
+    LogWarn("not allow %d:%s[%s]", id_, type_.c_str(), label_.c_str());
     return false;
   }
 }

version.mk

@@ -1,4 +1,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 5
-TBOX_VERSION_REVISION := 16
+TBOX_VERSION_REVISION := 17