2.1.0: amcp: Fixed some error reporting issues.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2547 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/protocol/amcp/AMCPCommandQueue.cpp b/protocol/amcp/AMCPCommandQueue.cpp
index a77adf54bfa881a5ae5a8474bbb0c792874280dc..d8d7cc40058da692c2104d2faf7a33d0577ef39e 100644 (file)
--- a/protocol/amcp/AMCPCommandQueue.cpp
+++ b/protocol/amcp/AMCPCommandQueue.cpp
@@ -42,13 +42,13 @@ void AMCPCommandQueue::AddCommand(AMCPCommandPtr pCurrentCommand)
        if(pCurrentCommand->GetScheduling() == ImmediatelyAndClear)\r
                executor_.clear();\r
 \r
-       if(executor_.size() > 64)\r
+       if(executor_.size() > 128)\r
        {\r
                try\r
                {\r
                        CASPAR_LOG(error) << "AMCP Command Queue Overflow.";\r
                        CASPAR_LOG(error) << "Failed to execute command:" << pCurrentCommand->print();\r
-                       pCurrentCommand->SetReplyString(L"500 FAILED");\r
+                       pCurrentCommand->SetReplyString(L"500 FAILED\r\n");\r
                        pCurrentCommand->SendReply();\r
                }\r
                catch(...)\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 064b5d76de6d23be30d1e7fcc01171327dc76fde..2afebb5873ca1a8ac7c4a3491691ceeb3689f661 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -1328,6 +1328,7 @@ bool CinfCommand::DoExecute()
        }\r
        catch(...)\r
        {\r
+               CASPAR_LOG_CURRENT_EXCEPTION();\r
                SetReplyString(TEXT("404 CINF ERROR\r\n"));\r
                return false;\r
        }\r
@@ -1470,6 +1471,7 @@ bool InfoCommand::DoExecute()
        }\r
        catch(...)\r
        {\r
+               CASPAR_LOG_CURRENT_EXCEPTION();\r
                SetReplyString(TEXT("403 INFO ERROR\r\n"));\r
                return false;\r
        }\r
@@ -1489,23 +1491,42 @@ bool ClsCommand::DoExecute()
                tga = still\r
                col = still\r
        */\r
-       std::wstringstream replyString;\r
-       replyString << TEXT("200 CLS OK\r\n");\r
-       replyString << ListMedia();\r
-       replyString << TEXT("\r\n");\r
-       SetReplyString(boost::to_upper_copy(replyString.str()));\r
+       try\r
+       {\r
+               std::wstringstream replyString;\r
+               replyString << TEXT("200 CLS OK\r\n");\r
+               replyString << ListMedia();\r
+               replyString << TEXT("\r\n");\r
+               SetReplyString(boost::to_upper_copy(replyString.str()));\r
+       }\r
+       catch(...)\r
+       {\r
+               CASPAR_LOG_CURRENT_EXCEPTION();\r
+               SetReplyString(TEXT("501 CLS FAILED\r\n"));\r
+               return false;\r
+       }\r
+\r
        return true;\r
 }\r
 \r
 bool TlsCommand::DoExecute()\r
 {\r
-       std::wstringstream replyString;\r
-       replyString << TEXT("200 TLS OK\r\n");\r
+       try\r
+       {\r
+               std::wstringstream replyString;\r
+               replyString << TEXT("200 TLS OK\r\n");\r
 \r
-       replyString << ListTemplates();\r
-       replyString << TEXT("\r\n");\r
+               replyString << ListTemplates();\r
+               replyString << TEXT("\r\n");\r
 \r
-       SetReplyString(replyString.str());\r
+               SetReplyString(replyString.str());\r
+       }\r
+       catch(...)\r
+       {\r
+               CASPAR_LOG_CURRENT_EXCEPTION();\r
+               SetReplyString(TEXT("501 TLS FAILED\r\n"));\r
+               return false;\r
+       }\r
        return true;\r
 }\r
 \r
@@ -1535,26 +1556,35 @@ bool ByeCommand::DoExecute()
 \r
 bool SetCommand::DoExecute()\r
 {\r
-       std::wstring name = _parameters[0];\r
-       std::transform(name.begin(), name.end(), name.begin(), toupper);\r
+       try\r
+       {\r
+               std::wstring name = _parameters[0];\r
+               std::transform(name.begin(), name.end(), name.begin(), toupper);\r
 \r
-       std::wstring value = _parameters[1];\r
-       std::transform(value.begin(), value.end(), value.begin(), toupper);\r
+               std::wstring value = _parameters[1];\r
+               std::transform(value.begin(), value.end(), value.begin(), toupper);\r
 \r
-       if(name == TEXT("MODE"))\r
-       {\r
-               auto format_desc = core::video_format_desc(value);\r
-               if(format_desc.format != core::video_format::invalid)\r
+               if(name == TEXT("MODE"))\r
                {\r
-                       GetChannel()->video_format_desc(format_desc);\r
-                       SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
+                       auto format_desc = core::video_format_desc(value);\r
+                       if(format_desc.format != core::video_format::invalid)\r
+                       {\r
+                               GetChannel()->video_format_desc(format_desc);\r
+                               SetReplyString(TEXT("202 SET MODE OK\r\n"));\r
+                       }\r
+                       else\r
+                               SetReplyString(TEXT("501 SET MODE FAILED\r\n"));\r
                }\r
                else\r
-                       SetReplyString(TEXT("501 SET MODE FAILED\r\n"));\r
+               {\r
+                       this->SetReplyString(TEXT("403 SET ERROR\r\n"));\r
+               }\r
        }\r
-       else\r
+       catch(...)\r
        {\r
-               this->SetReplyString(TEXT("403 SET ERROR\r\n"));\r
+               CASPAR_LOG_CURRENT_EXCEPTION();\r
+               SetReplyString(TEXT("501 SET FAILED\r\n"));\r
+               return false;\r
        }\r
 \r
        return true;\r

diff --git a/protocol/util/AsyncEventServer.cpp b/protocol/util/AsyncEventServer.cpp
index 7cf3773814b0c47bc0699c187ed1a691cd69dab1..c8f3916c1f749a21eecf1daa148f7e6720555596 100644 (file)
--- a/protocol/util/AsyncEventServer.cpp
+++ b/protocol/util/AsyncEventServer.cpp
@@ -212,7 +212,10 @@ private:
        {\r
                if(!error)                      \r
                {\r
-                       CASPAR_LOG(trace) << print() << L" Sent: " << u16(std::string(data->begin(), data->end()));\r
+                       if(data->size() < 512)\r
+                               CASPAR_LOG(trace) << print() << L" Sent: " << u16(std::string(data->begin(), data->end()));\r
+                       else\r
+                               CASPAR_LOG(trace) << print() << L" Sent more than 512 bytes.";\r
                }\r
                else if (error != boost::asio::error::operation_aborted)                \r
                {\r