@@ -1,6 +1,6 @@

 Name:          c-rest-engine

 Summary:       minimal http(s) server library

-Version:       1.1

+Version:       1.2

 Release:       1%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

@@ -11,13 +11,8 @@ BuildRequires: coreutils >= 8.22

 BuildRequires: openssl-devel >= 1.0.1

 Source0:       %{name}-%{version}.tar.gz

 Patch0:        c-rest-engine-aarch64.patch

-Patch1:        socket_RW.patch

-Patch2:        syslog_noInit.patch

-Patch3:        socket_logging.patch

-Patch4:        c-rest-engine-fix-log-file-len.patch

-Patch5:        errno_init.patch

-Patch6:        ssl_shutdown.patch

-%define sha1   c-rest-engine=a25927fd98ec92df5e210cc4941fa626604636f6

+Patch1:        c-rest-engine-fix-log-file-len.patch

+%define sha1   c-rest-engine=25aa9d1f2680e26114dee18365c510692552f8e4

 %description

 c-rest-engine is a minimal embedded http(s) server written in C.

@@ -36,11 +31,6 @@ development libs and header files for c-rest-engine

 %setup -q

 %patch0 -p1

 %patch1 -p1

-%patch2 -p1

-%patch3 -p1

-%patch4 -p1

-%patch5 -p1

-%patch6 -p1

 %build

 cd build

@@ -74,6 +64,8 @@ find %{buildroot} -name '*.la' -delete

 # %doc ChangeLog README COPYING

 %changelog

+*  Wed Feb 14 2018 Kumar Kaushik <kaushikk@vmware.com> 1.2-1

+-  Upgrading to version 1.2. Removing all upstream patches.

 *  Thu Nov 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1-1

 -  Update to v1.1-1

 *  Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.5-2

deleted file mode 100644

@@ -1,111 +0,0 @@

-From b9a3185e4556e8c5785a60fb57c2924bbd0529f7 Mon Sep 17 00:00:00 2001

-From: Kumar Kaushik <kaushikk@vmware.com>

-Date: Wed, 29 Nov 2017 18:47:39 -0800

-Subject: [PATCH] Avoiding previous errno variable use

-

-Change-Id: I76b0ef967df8b1ad6fa1844e1e461af470bb3b0f

- transport/posix/socket.c | 51 +++++++++++++++++++++++++++++++-----------------

- 1 file changed, 33 insertions(+), 18 deletions(-)

-

-diff --git a/transport/posix/socket.c b/transport/posix/socket.c

-index 79c7a38..d3a3dbc 100644

-+++ b/transport/posix/socket.c

-@@ -853,6 +853,8 @@ VmSockPosixRead(

-     do

-     {

-         nRead = 0;

-+        errno = 0;

-+        errorCode = 0;

-         if (pRESTHandle->pSSLInfo->isSecure && (pSocket->ssl != NULL))

-         {

-             nRead = SSL_read(pSocket->ssl, (pszBufPrev + nPrevBuf), MAX_DATA_BUFFER_LEN);

-@@ -864,7 +866,7 @@ VmSockPosixRead(

-             errorCode = errno;

-         }

- 

--        if ((nRead > 0) && (nRead <= MAX_DATA_BUFFER_LEN))

-+        if (nRead > 0)

-         {

-             nPrevBuf += nRead;

-             dwError = VmRESTReallocateMemory(

-@@ -877,22 +879,6 @@ VmSockPosixRead(

-         }

-     }while((nRead > 0) && (nPrevBuf < pRESTHandle->pRESTConfig->maxDataPerConnMB));

- 

--    if (((pSocket->fd > 0) && (errorCode == EAGAIN || errorCode == EWOULDBLOCK)) || ((pRESTHandle->pSSLInfo->isSecure) && (errorCode == SSL_ERROR_WANT_READ)))

--    {

--        dwError = REST_ENGINE_SUCCESS;

--    }

--    else if (nRead < 0)

--    {

--        VMREST_LOG_ERROR(pRESTHandle, "Socket read failed with error code %u", errorCode);

--        dwError = errorCode;

--    }

--    else if (nRead == 0)

--    {

--        VMREST_LOG_ERROR(pRESTHandle,"%s", "Socket read failed due to broken pipe");

--        dwError = VM_SOCK_POSIX_ERROR_BROKEN_PIPE;

--    }

--    BAIL_ON_VMREST_ERROR(dwError);

--

-     if (nPrevBuf >= pRESTHandle->pRESTConfig->maxDataPerConnMB)

-     {

-         /**** Discard the request here itself. This might be the first read IO cycle ****/

-@@ -901,6 +887,33 @@ VmSockPosixRead(

-     }

-     BAIL_ON_VMREST_ERROR(dwError);

- 

-+    if (nRead == -1)

-+    {

-+        if (((pSocket->fd > 0) && (errorCode == EAGAIN || errorCode == EWOULDBLOCK)) || ((pRESTHandle->pSSLInfo->isSecure) && (errorCode == SSL_ERROR_WANT_READ)))

-+        {

-+            dwError = REST_ENGINE_SUCCESS;

-+        }

-+        else

-+        {

-+            VMREST_LOG_ERROR(pRESTHandle,"%s","Unknown socket read error: errno %u, errorCode %u, nRead %d", errno, errorCode, nRead);

-+            dwError = REST_ENGINE_FAILURE;

-+        }

-+    }

-+    else

-+    {

-+        if (nRead == 0)

-+        {

-+            VMREST_LOG_ERROR(pRESTHandle,"%s","Socket Read Failed: Remote has closed the connection");

-+            dwError = VM_SOCK_POSIX_ERROR_BROKEN_PIPE;

-+        }

-+        else

-+        {

-+            VMREST_LOG_ERROR(pRESTHandle, "Socket read failed with error code %u", errorCode);

-+            dwError = errorCode;

-+        }

-+    }

-+    BAIL_ON_VMREST_ERROR(dwError);

-+

-     pSocket->pszBuffer = pszBufPrev;

-     pSocket->nProcessed = 0;

-     pSocket->nBufData = nPrevBuf;

-@@ -933,11 +946,12 @@ VmSockPosixRead(

-     if (pszBufPrev && pSocket && pRESTHandle->pSockContext)

-     {

-         /**** Delete the socket from poller ****/

-+        

-         VmSockPosixEventQueueDelete_inlock(

-             pRESTHandle->pSockContext->pEventQueue,

-             pSocket

-             );

--

-+        

-         VmRESTFreeMemory(pszBufPrev);

-         pszBufPrev = NULL;

-         pSocket->pszBuffer = NULL;

-@@ -1566,6 +1580,7 @@ VmSockPosixSetRequestHandle(

-                       pSocket

-                       );

-         BAIL_ON_VMREST_ERROR(dwError);

-+       

- 

-         if (pSocket->pTimerSocket->fd > 0)

-         {

deleted file mode 100644

@@ -1,54 +0,0 @@

-diff -ru c-rest-engine-1.1/transport/posix/defines.h c-rest-engine-1.1-modified/transport/posix/defines.h

-+++ c-rest-engine-1.1-modified/transport/posix/defines.h	2017-11-10 15:56:01.170279430 -0800

-@@ -50,6 +50,7 @@

- 

- /**** Transport internal error codes ****/

- #define VM_SOCK_POSIX_ERROR_SYS_CALL_FAILED    5100

-+#define VM_SOCK_POSIX_ERROR_BROKEN_PIPE        5101

- #define MAX_RETRY_ATTEMPTS                     50000

- 

- 

-diff -ru c-rest-engine-1.1/transport/posix/socket.c c-rest-engine-1.1-modified/transport/posix/socket.c

-+++ c-rest-engine-1.1-modified/transport/posix/socket.c	2017-11-10 15:55:25.410277664 -0800

-@@ -879,10 +879,16 @@

-     {

-         dwError = REST_ENGINE_SUCCESS;

-     }

--    else

-+    else if (nRead < 0)

-     {

-+        VMREST_LOG_ERROR(pRESTHandle, "Socket read failed with error code %u", errorCode);

-         dwError = errorCode;

-     }

-+    else if (nRead == 0)

-+    {

-+        VMREST_LOG_ERROR(pRESTHandle,"%s", "Socket read failed due to broken pipe");

-+        dwError = VM_SOCK_POSIX_ERROR_BROKEN_PIPE;

-+    }

-     BAIL_ON_VMREST_ERROR(dwError);

- 

-     if (nPrevBuf >= pRESTHandle->pRESTConfig->maxDataPerConnMB)

-@@ -980,7 +986,7 @@

-              nWritten = write(pSocket->fd, (pszBuffer + nWrittenTotal) ,nRemaining);

-              errorCode = errno;

-          }

--         if (nWritten >= 0)

-+         if (nWritten > 0)

-          {

-              nWrittenTotal += nWritten;

-              nRemaining -= nWritten;

-@@ -1017,6 +1023,12 @@

-                      BAIL_ON_VMREST_ERROR(dwError);

-                  }

-              }

-+             else

-+             {

-+                 dwError = VM_SOCK_POSIX_ERROR_SYS_CALL_FAILED;

-+                 VMREST_LOG_ERROR(pRESTHandle,"Socket write failed with error code %u, dwError %u, nWritten %d", errorCode, dwError, nWritten);

-+                 BAIL_ON_VMREST_ERROR(dwError);

-+             }

-         }

-     }

-     VMREST_LOG_DEBUG(pRESTHandle,"\nWrite Status on Socket with fd = %d\nRequested: %d nBufLen\nWritten %d bytes\n", pSocket->fd, nBufLen, nWrittenTotal);

deleted file mode 100644

@@ -1,94 +0,0 @@

-From 8afe888fb34b1d121bae7701c51d0e7d0c96cbb5 Mon Sep 17 00:00:00 2001

-From: Kumar Kaushik <kaushikk@vmware.com>

-Date: Mon, 20 Nov 2017 15:21:56 -0800

-Subject: [PATCH] Adding more debug for socket read failures

-

-Change-Id: I85b10413b4fe9273a11e46da038aa2e31ffd0318

-(cherry picked from commit a0c4357aca99a08a28d10875aff87c6e3d1798be)

- common/sockinterface.c   | 11 +++++------

- transport/posix/socket.c | 27 ++++++++++++++++++++++++++-

- 2 files changed, 31 insertions(+), 7 deletions(-)

-

-diff --git a/common/sockinterface.c b/common/sockinterface.c

-index a53c4a5..403189c 100644

-+++ b/common/sockinterface.c

-@@ -521,11 +521,10 @@ VmRESTTcpReceiveNewData(

-    {

-        VMREST_LOG_DEBUG(pRESTHandle,"%s","Calling closed connection....");

-        /**** Close connection ****/ 

--       dwError = VmRESTDisconnectClient(

--                     pRESTHandle,

--                     pSocket

--                     );

--       BAIL_ON_VMREST_ERROR(dwError);

-+       VmRESTDisconnectClient(

-+           pRESTHandle,

-+           pSocket

-+           );

- 

-        /****  free request object memory ****/

-        if (pRequest)

-@@ -542,7 +541,7 @@ VmRESTTcpReceiveNewData(

- 

- error:

- 

--    VMREST_LOG_DEBUG(pRESTHandle,"ERROR code %u", dwError);

-+    VMREST_LOG_ERROR(pRESTHandle,"ERROR code %u", dwError);

-     goto cleanup;

- }

- 

-diff --git a/transport/posix/socket.c b/transport/posix/socket.c

-index 029633a..79c7a38 100644

-+++ b/transport/posix/socket.c

-@@ -539,6 +539,8 @@ VmSockPosixWaitForEvent(

-                 BAIL_ON_VMREST_ERROR(dwError);

-             }

- 

-+            VMREST_LOG_DEBUG(pRESTHandle,"Notification on socket fd %d", pEventSocket->fd);

-+

-             if (pEvent->events & (EPOLLERR | EPOLLHUP))

-             {

-                 eventType = VM_SOCK_EVENT_TYPE_CONNECTION_CLOSED;

-@@ -919,8 +921,23 @@ VmSockPosixRead(

- 

- error:

- 

--    if (pszBufPrev && pSocket)

-+    if (pSocket)

-+    {

-+        VMREST_LOG_ERROR(pRESTHandle,"Socket read failed with Socket fd %d, dwError = %u, nRead = %d, errno = %u, errorCode = %u", pSocket->fd, dwError, nRead, errno, errorCode);

-+    }

-+    else

-+    {

-+        VMREST_LOG_ERROR(pRESTHandle,"Socket read failed with dwError = %u, nRead = %d, errno = %u, errorCode = %u", dwError, nRead, errno, errorCode);

-+    }

-+

-+    if (pszBufPrev && pSocket && pRESTHandle->pSockContext)

-     {

-+        /**** Delete the socket from poller ****/

-+        VmSockPosixEventQueueDelete_inlock(

-+            pRESTHandle->pSockContext->pEventQueue,

-+            pSocket

-+            );

-+

-         VmRESTFreeMemory(pszBufPrev);

-         pszBufPrev = NULL;

-         pSocket->pszBuffer = NULL;

-@@ -1542,6 +1559,14 @@ VmSockPosixSetRequestHandle(

-                       pSocket->pTimerSocket

-                       );

-         BAIL_ON_VMREST_ERROR(dwError);

-+

-+        /**** Delete actual IO socket from poller ****/

-+        dwError = VmSockPosixEventQueueDelete_inlock(

-+                      pQueue,

-+                      pSocket

-+                      );

-+        BAIL_ON_VMREST_ERROR(dwError);

-+

-         if (pSocket->pTimerSocket->fd > 0)

-         {

-             close(pSocket->pTimerSocket->fd);

deleted file mode 100644

@@ -1,123 +0,0 @@

-From a7aba08f7fd2700c92fd9661eee212755ba8795e Mon Sep 17 00:00:00 2001

-From: Kumar Kaushik <kaushikk@vmware.com>

-Date: Thu, 7 Dec 2017 12:53:17 -0800

-Subject: [PATCH] Fixing tls: unexpected message ERROR

-

-Change-Id: I63dce89d4dcfa445b6594d4b776ef8827f1498ff

-(cherry picked from commit 424f6d0f3435eccad781d39ef0c656a00395dc46)

- transport/posix/socket.c | 34 +++++++++++++++++++++++-----------

- 1 file changed, 23 insertions(+), 11 deletions(-)

-

-diff --git a/transport/posix/socket.c b/transport/posix/socket.c

-index d3a3dbc..18cef89 100644

-+++ b/transport/posix/socket.c

-@@ -576,7 +576,6 @@ VmSockPosixWaitForEvent(

-                                    FALSE

-                                    );

-                     BAIL_ON_VMREST_ERROR(dwError);

--                

-                 }

- 

-                 dwError = VmSockPosixEventQueueAdd_inlock(

-@@ -895,7 +894,7 @@ VmSockPosixRead(

-         }

-         else

-         {

--            VMREST_LOG_ERROR(pRESTHandle,"%s","Unknown socket read error: errno %u, errorCode %u, nRead %d", errno, errorCode, nRead);

-+            VMREST_LOG_ERROR(pRESTHandle,"Unknown socket read error: errno %u, errorCode %u, nRead %d", errno, errorCode, nRead);

-             dwError = REST_ENGINE_FAILURE;

-         }

-     }

-@@ -1007,6 +1006,9 @@ VmSockPosixWrite(

- 

-     while(nWrittenTotal < nBufLen )

-     {

-+         nWritten = 0;

-+         errorCode = 0;

-+         errno = 0;

-          if (pRESTHandle->pSSLInfo->isSecure && (pSocket->ssl != NULL))

-          {

-              nWritten = SSL_write(pSocket->ssl,(pszBuffer + nWrittenTotal),nRemaining);

-@@ -1030,7 +1032,7 @@ VmSockPosixWrite(

-          }

-          else

-          {

--             if (errorCode == EAGAIN || errorCode == EWOULDBLOCK || errorCode == SSL_ERROR_WANT_WRITE)

-+             if ((nWritten < 0) && (errorCode == EAGAIN || errorCode == EWOULDBLOCK || errorCode == SSL_ERROR_WANT_WRITE))

-              {

-                  if (timeOutSec >= 0)

-                  {

-@@ -1101,6 +1103,8 @@ VmSockPosixCloseSocket(

-     )

- {

-     DWORD                            dwError = REST_ENGINE_SUCCESS;

-+    int                              ret = 0;

-+    uint32_t                         errorCode = 0;

-     BOOLEAN                          bLocked = FALSE;

- 

-     if (!pRESTHandle || !pSocket )

-@@ -1121,18 +1125,24 @@ VmSockPosixCloseSocket(

-         pSocket->pTimerSocket->fd = -1;

-     }

- 

-+    if (pRESTHandle->pSSLInfo->isSecure && pSocket->ssl)

-+    {

-+        ret = SSL_shutdown(pSocket->ssl);

-+        if (ret < 0)

-+        {

-+            errorCode = SSL_get_error(pSocket->ssl, ret);

-+            VMREST_LOG_ERROR(pRESTHandle,"Error on SSL_shutdown on socket %d, return value %d, errorCode %u", pSocket->fd, ret, errorCode);

-+        }

-+        SSL_free(pSocket->ssl);

-+        pSocket->ssl = NULL;

-+    }

-+

-     if (pSocket->fd >= 0)

-     {

-         close(pSocket->fd);

-         pSocket->fd = -1;

-     }

- 

--    if (pRESTHandle->pSSLInfo->isSecure && pSocket->ssl)

--    {

--        SSL_shutdown(pSocket->ssl);

--        SSL_free(pSocket->ssl);

--        pSocket->ssl = NULL;

--    }

- 

- cleanup:

- 

-@@ -1742,6 +1752,7 @@ VmSockPosixIsSafeToCloseConnOnTimeOut(

-     BAIL_ON_VMREST_ERROR(dwError);

- 

-     pSocket = pTimerSocket->pIoSocket;

-+    errno = 0;

- 

-     if ((pRESTHandle->pSSLInfo->isSecure) && (pSocket->ssl))

-     {

-@@ -1771,6 +1782,7 @@ VmSockPosixIsSafeToCloseConnOnTimeOut(

-             do

-             {

-                 errorCode = 0;

-+                errno = 0;

-                 nRead = 0;

-                 nRead = read(pTimerSocket->fd, &res, sizeof(res));

-                 errorCode = errno;

-@@ -1918,13 +1930,13 @@ VmRESTAcceptSSLContext(

-     }

-     else if ((ret == -1) && ((errorCode == SSL_ERROR_WANT_READ) || (errorCode == SSL_ERROR_WANT_WRITE)))

-     {

--       VMREST_LOG_DEBUG(pRESTHandle,"SSL handshake not completed for socket %d", pSocket->fd);

-+       VMREST_LOG_DEBUG(pRESTHandle," SSL handshake not completed for socket %d, ret %d, errorCode %u", pSocket->fd, ret, errorCode);

-        pSocket->bSSLHandShakeCompleted = FALSE;

-        bReArm = TRUE;

-     }

-     else

-     {

--        VMREST_LOG_ERROR(pRESTHandle, "SSL handshake failed...connection will be closed for socket with fd %d", pSocket->fd);

-+        VMREST_LOG_ERROR(pRESTHandle, "SSL handshake failed...connection will be closed for socket with fd %d, ret %d, errorCode %u", pSocket->fd, ret, errorCode);

-         dwError = VMREST_TRANSPORT_SSL_ACCEPT_FAILED;

-         BAIL_ON_VMREST_ERROR(dwError);

-     }

deleted file mode 100644

@@ -1,151 +0,0 @@

-From 56c8c0ffd82c8fe8c396d8c00f23688adcdc9ecd Mon Sep 17 00:00:00 2001

-From: Kumar Kaushik <kaushikk@vmware.com>

-Date: Wed, 15 Nov 2017 17:24:44 -0800

-Subject: [PATCH] Remove init/shutdown of syslog from library

-

-Change-Id: I7705f44c468d2ce69a15b531e108ef0cfbe391b8

- build/package/rpm/c-rest-engine.spec |  4 +++-

- common/logging.c                     | 45 ++++++++----------------------------

- server/vmrestd/main.c                |  8 ++++++-

- 3 files changed, 20 insertions(+), 37 deletions(-)

-

-diff --git a/build/package/rpm/c-rest-engine.spec b/build/package/rpm/c-rest-engine.spec

-index 8730113..02c1e62 100644

-+++ b/build/package/rpm/c-rest-engine.spec

-@@ -1,7 +1,7 @@

- Name:          c-rest-engine

- Summary:       Minimal http(s) server library

- Version:       1.1

--Release:       1%{?dist}

-+Release:       3%{?dist}

- Group:         Applications/System

- Vendor:        VMware, Inc.

- License:       Apache 2.0

-diff --git a/common/logging.c b/common/logging.c

-index 6bef25c..385c0b6 100644

-+++ b/common/logging.c

-@@ -41,13 +41,7 @@ VmRESTLogInitialize(

-     }

-     BAIL_ON_VMREST_ERROR(dwError);

- 

--    if (pRESTHandle->pRESTConfig->useSysLog)

--    {

--        /**** Use syslog ****/

--        openlog(pRESTHandle->pRESTConfig->pszDaemonName, 0, LOG_DAEMON);

--        setlogmask(LOG_UPTO(logLevelToSysLogLevel(pRESTHandle->debugLogLevel)));

--    }

--    else if (!(IsNullOrEmptyString(pRESTHandle->pRESTConfig->pszDebugLogFile)))

-+    if ((!(IsNullOrEmptyString(pRESTHandle->pRESTConfig->pszDebugLogFile))) && (pRESTHandle->pRESTConfig->useSysLog == FALSE))

-     {

-         if ((pRESTHandle->logFile = fopen(pRESTHandle->pRESTConfig->pszDebugLogFile, "a")) == NULL)

-         {

-@@ -55,10 +49,6 @@ VmRESTLogInitialize(

-             dwError = REST_ENGINE_FAILURE;

-         }

-     }

--    else

--    {

--        dwError = REST_ENGINE_FAILURE;

--    }

-     BAIL_ON_VMREST_ERROR(dwError);

- 

- cleanup:

-@@ -76,11 +66,7 @@ VmRESTLogTerminate(

-     PVMREST_HANDLE                   pRESTHandle

-     )

- {

--    if (pRESTHandle && pRESTHandle->pRESTConfig->useSysLog)

--    {

--        closelog();

--    }

--    else if (pRESTHandle && pRESTHandle->logFile != NULL)

-+    if (pRESTHandle && pRESTHandle->logFile != NULL)

-     {

-        fclose(pRESTHandle->logFile);

-        pRESTHandle->logFile = NULL;

-@@ -95,10 +81,9 @@ VmRESTLog(

-     ...)

- {

-     char        extraLogMessage[EXTRA_LOG_MESSAGE_LEN] = {0};

--    struct      timespec tspec = {0};

--    time_t      ltime;

--    struct      tm mytm = {0};

-     char        logMessage[MAX_LOG_MESSAGE_LEN];

-+    struct      tm* tm_info = NULL;

-+    struct      timeval tv = {0};

- 	

-     va_list     va;

-     const char* logLevelTag = "";

-@@ -115,30 +100,20 @@ VmRESTLog(

-         vsnprintf( logMessage, sizeof(logMessage), fmt, va );

-         logMessage[sizeof(logMessage)-1] = '\0';

-         va_end( va );

--        ltime = time(&ltime);

-+        gettimeofday(&tv, NULL);

-+

-+        tm_info = localtime(&tv.tv_sec);

-         logLevelTag = logLevelToTag(level);

--        localtime_r(&ltime, &mytm);

--        snprintf(extraLogMessage, sizeof(extraLogMessage) - 1,

--                  "%4d%2d%2d%2d%2d%2d.%03ld:t@%lu:%-3.7s: ",

--                  mytm.tm_year+1900,

--                  mytm.tm_mon+1,

--                  mytm.tm_mday,

--                  mytm.tm_hour,

--                  mytm.tm_min,

--                  mytm.tm_sec,

--                  tspec.tv_nsec/NSECS_PER_MSEC,

--                  (unsigned long) pthread_self(),

--                  logLevelTag? logLevelTag : "UNKNOWN");

-+        strftime(extraLogMessage, sizeof(extraLogMessage) - 1, "%F %T", tm_info);   

- 

-         if (pRESTHandle->pRESTConfig->useSysLog)

-         {

-             sysLogLevel = logLevelToSysLogLevel(level);

--            snprintf(extraLogMessage, sizeof(extraLogMessage) - 1, "t@%lu: ", (unsigned long) pthread_self());

--            syslog(sysLogLevel, "%s: %s%s", logLevelToTag(level), extraLogMessage, logMessage);

-+            syslog(sysLogLevel, "%s:%lu t@%lu %-3.7s: %s\n", extraLogMessage, (long unsigned)(tv.tv_usec), (unsigned long) pthread_self(),(logLevelTag? logLevelTag : "UNKNOWN"),logMessage);

-         }

-         else if (pRESTHandle->logFile != NULL)

-         {

--            fprintf(pRESTHandle->logFile, "%s%s\n", extraLogMessage, logMessage);

-+            fprintf(pRESTHandle->logFile, "%s:%lu t@%lu %-3.7s: %s\n", extraLogMessage, (long unsigned)(tv.tv_usec), (unsigned long) pthread_self(),(logLevelTag? logLevelTag : "UNKNOWN"),logMessage);

-             fflush( pRESTHandle->logFile );

-         }

-     }

-diff --git a/server/vmrestd/main.c b/server/vmrestd/main.c

-index 353f597..214b28d 100644

-+++ b/server/vmrestd/main.c

-@@ -116,7 +116,7 @@ int main()

-     pConfig1->maxDataPerConnMB = 10;

-     pConfig1->nWorkerThr = 5;

-     pConfig1->nClientCnt = 5;

--    pConfig1->useSysLog = FALSE;

-+    pConfig1->useSysLog = TRUE;

-     pConfig1->pszSSLCertificate = "/root/mycert.pem";

-     pConfig1->isSecure = TRUE;

-     pConfig1->pszSSLKey = "/root/mycert.pem";

-@@ -127,6 +127,10 @@ int main()

-     pConfig1->pszSSLCipherList = NULL;

-     pConfig1->SSLCtxOptionsFlag = 0;

- 

-+    /**** Init sys log ****/

-+    openlog("VMREST_KAUSHIK", 0, LOG_DAEMON);

-+    setlogmask(LOG_UPTO(LOG_DEBUG));

-+

-     dwError = VmRESTInit(pConfig, &gpRESTHandle);

-     dwError = VmRESTInit(pConfig1, &gpRESTHandle1);

- 

-@@ -177,6 +181,8 @@ int main()

-  //   VmRESTShutdownSSL(sslCtx1);

- #endif

- 

-+    closelog();

-+

- return dwError;

- 

- }