[X2Go-Commits] [nx-libs] 06/06: nxcomp/src/Loop.cpp: use new log continuation mechanism.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit 4d046e44f9396720fc895bf780d0cbb7314a3c2b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Dec 25 02:19:17 2017 +0100

    nxcomp/src/Loop.cpp: use new log continuation mechanism.
    
    Should fix messages queuing up indefinitely (until they are discarded at
    program termination, at least) and missing messages in general.
    
    Fixes: ArcticaProject/nx-libs#577
    Fixes: ArcticaProject/nx-libs#611
---
 nxcomp/src/Loop.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index b886154..436250e 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -13449,12 +13449,12 @@ int ParseArg(const char *type, const char *name, const char *value)
     case 'm':
     case 'g':
     {
-      nxinfo << (char) toupper(*id);
+      nxinfo_append << (char) toupper(*id);
       break;
     }
   }
 
-  nxinfo << ".\n" << std::flush;
+  nxinfo_append << ".\n" << std::flush;
 
 
   double result = atof(string) * base;
@@ -14034,7 +14034,7 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
     {
       if (FD_ISSET(j, &readSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -14042,11 +14042,11 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
 
     i = 0;
@@ -14057,7 +14057,7 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
     {
       if (FD_ISSET(j, &writeSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -14065,11 +14065,11 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
   }
 
@@ -14115,7 +14115,7 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
     {
       if (FD_ISSET(j, &readSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -14123,11 +14123,11 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
 
     i = 0;
@@ -14138,7 +14138,7 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
     {
       if (FD_ISSET(j, &writeSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << "[" << j << "]" << std::flush;
 
         i++;
       }
@@ -14146,11 +14146,11 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
   }
 }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git