merged in publish handlers.

Socket.cpp

@@ -1,14 +1,16 @@
-#include "EPoll.h"
 #include "Socket.h"
+#include "EPoll.h"
 #include "Exception.h"
-#include "ZString.h"
 #include "Log.h"
+#include "ZString.h"
 
-namespace core {
+namespace core
+{
 
    void sigpipe_handler(int unused) {}
 
    Socket::Socket(EPoll &ePoll, std::string text) : ePoll(ePoll), text(text) {
+      coreutils::Log(coreutils::LOG_DEBUG_2) << "Socket object created [" << text << "].";
       buffer = (char *)malloc(4096);
       length = 4096;
    }
@@ -17,21 +19,22 @@ namespace core {
       shutDown = true;
       onUnregister();
       ePoll.unregisterSocket(this);
+      coreutils::Log(coreutils::LOG_DEBUG_4) << "Free on socket " << descriptor;
       free(buffer);
       if(descriptor == -1)
 		  return;
       close(descriptor);
       coreutils::Log(coreutils::LOG_DEBUG_1) << text << " has ended (" << descriptor << ").";
-      sleep(1);
    }
 
-   void Socket::setDescriptor(int descriptor) {
-      if((descriptor == -1) && (errno == 24)) {
-			shutdown("Too many files open");
-			throw coreutils::Exception("Too many files open. Refusing connection.");
+   void Socket::setDescriptor(int descriptor)
+   {
+      if ((descriptor == -1) && (errno == 24))
+      {
+         shutdown("Too many files open");
+         throw coreutils::Exception("Too many files open. Refusing connection.");
       }
       coreutils::Log(coreutils::LOG_DEBUG_1) << text << " has started (" << descriptor << ").";
-//      coreutils::Log(coreutils::LOG_DEBUG_3) << "Descriptor set to " << descriptor << " for Socket.";
       if(descriptor < 3)
         throw coreutils::Exception("Descriptor out of range", __FILE__, __LINE__);
       this->descriptor = descriptor;
@@ -40,16 +43,19 @@ namespace core {
       onRegistered();
    }
 
-   int Socket::getDescriptor() {
+   int Socket::getDescriptor()
+   {
       return descriptor;
    }
 
-   void Socket::setBufferSize(int length) {
+   void Socket::setBufferSize(int length)
+   {
       this->length = length;
       buffer = (char *)realloc(buffer, length);
    }
 
-   int Socket::getBufferSize() {
+   int Socket::getBufferSize()
+   {
       return length;
    }
 
@@ -70,7 +76,7 @@ namespace core {
       }
       if(event.events & EPOLLIN) {
          coreutils::ZString zbuffer(buffer, length);
-      	receiveData(zbuffer);
+         receiveData(zbuffer);
       }
       if(event.events & EPOLLWRNORM) {
 	      writeSocket();
@@ -83,11 +89,13 @@ namespace core {
       return !shutDown;
    }
 
-   void Socket::onDataReceived(std::string data) {
+   void Socket::onDataReceived(std::string data)
+   {
       throw coreutils::Exception("Need to override onDataReceived.", __FILE__, __LINE__, -1);
    }
 
-   void Socket::onDataReceived(coreutils::ZString &data) {
+   void Socket::onDataReceived(coreutils::ZString &data)
+   {
       onDataReceived(std::string(data.getData(), data.getLength()));
    }
 
@@ -100,27 +108,29 @@ namespace core {
       if((len = ::read(getDescriptor(), buffer.getData(), buffer.getLength())) >= 0) {
          coreutils::ZString zbuffer(buffer.getData(), len);
          coreutils::Log(coreutils::LOG_DEBUG_1) << zbuffer;
-	      onDataReceived(zbuffer);
+         onDataReceived(zbuffer);
       }
-      else {
+      else
+      {
 
-	 error = errno;
+         error = errno;
 
-	 switch (error) {
+         switch (error)
+         {
 
-	    // When a listening socket receives a connection
-	    // request we get one of these.
-	    //
-	  case ENOTCONN:
+            // When a listening socket receives a connection
+            // request we get one of these.
+            //
+         case ENOTCONN:
             onDataReceived(blank);
-	    break;
-
-	  case ECONNRESET:
             break;
 
-	  default:
+         case ECONNRESET:
+            break;
+
+         default:
             throw coreutils::Exception("Error in read of data from socket.", __FILE__, __LINE__, error);
-	 }
+         }
       }
    }
 
@@ -130,7 +140,7 @@ namespace core {
 			if(!shutDown)
 			  int rc = ::write(descriptor, fifo.front().c_str(), fifo.front().length());
          fifo.pop();
-	      outlock.unlock();
+         outlock.unlock();
       }
    }
 
@@ -145,11 +155,13 @@ namespace core {
       return 1;
    }
 
-   void Socket::output(std::stringstream &out) {
+   void Socket::output(std::stringstream &out)
+   {
       out << "|" << descriptor << "|";
    }
 
-   bool Socket::needsToWrite() {
+   bool Socket::needsToWrite()
+   {
       return fifo.size() > 0;
    }