Merge pull request markparticle#27 from markparticle/dev_mark

fix bug
Fanfan-2018 · Sep 23, 2020 · 3e35396 · 3e35396
2 parents 548deb8 + b2ac521
commit 3e35396
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 29 deletions.
diff --git a/code/buffer/buffer.cpp b/code/buffer/buffer.cpp
@@ -102,7 +102,7 @@ ssize_t Buffer::ReadFd(int fd, int* saveErrno) {
     }
     else {
         writePos_ = buffer_.size();
-        Append(buff, len - writePos_);
+        Append(buff, len - writable);
     }
     return len;
 }

diff --git a/code/http/httpconn.cpp b/code/http/httpconn.cpp
@@ -33,7 +33,6 @@ void HttpConn::reset() {
     writeBuff_.RetrieveAll();
     readBuff_.RetrieveAll();
     isClose_ = false;
-    request_.Init();
 }
 
 void HttpConn::Close() {
@@ -99,13 +98,18 @@ ssize_t HttpConn::write(int* saveErrno) {
     return len;
 }
 
-void HttpConn::process() {
-    if(request_.parse(readBuff_)) {
+bool HttpConn::process() {
+    request_.Init();
+    if(readBuff_.ReadableBytes() <= 0) {
+        return false;
+    }
+    else if(request_.parse(readBuff_)) {
         LOG_DEBUG("%s", request_.path().c_str());
         response_.Init(srcDir, request_.path(), request_.IsKeepAlive(), 200);
     } else {
         response_.Init(srcDir, request_.path(), false, 400);
     }
+
     response_.MakeResponse(writeBuff_);
     /* 响应头 */
     iov_[0].iov_base = const_cast<char*>(writeBuff_.Peek());
@@ -119,4 +123,5 @@ void HttpConn::process() {
         iovCnt_ = 2;
     } 
     LOG_DEBUG("filesize:%d, %d  to %d", response_.FileLen() , iovCnt_, ToWriteBytes());
+    return true;
 }
diff --git a/code/http/httpconn.h b/code/http/httpconn.h
@@ -36,7 +36,7 @@ class HttpConn {
     const char* GetIP() const;
     sockaddr_in GetAddr() const;
 
-    void process();
+    bool process();
     int ToWriteBytes() { 
         return iov_[0].iov_len + iov_[1].iov_len; 
     }

diff --git a/code/http/httprequest.cpp b/code/http/httprequest.cpp
@@ -21,8 +21,8 @@ void HttpRequest::Init() {
 }
 
 bool HttpRequest::IsKeepAlive() const {
-    if(post_.count("Connection") == 1) {
-        return post_.find("Connection")->second == "Keep-Alive" && version_ == "1.1";
+    if(header_.count("Connection") == 1) {
+        return header_.find("Connection")->second == "keep-alive" && version_ == "1.1";
     }
     return false;
 }
@@ -46,7 +46,7 @@ bool HttpRequest::parse(Buffer& buff) {
         case HEADERS:
             ParseHeader_(line);
             if(buff.ReadableBytes() <= 2) {
-                 state_ = FINISH;
+                state_ = FINISH;
             }
             break;
         case BODY:
@@ -57,7 +57,6 @@ bool HttpRequest::parse(Buffer& buff) {
         }
         if(lineEnd == buff.BeginWrite()) { break; }
         buff.RetrieveUntil(lineEnd + 2);
-
     }
     LOG_DEBUG("[%s], [%s], [%s]", method_.c_str(), path_.c_str(), version_.c_str());
     return true;

diff --git a/code/http/httpresponse.cpp b/code/http/httpresponse.cpp
@@ -55,10 +55,10 @@ HttpResponse::~HttpResponse() {
 }
 
 void HttpResponse::Init(const string& srcDir, string& path, bool isKeepAlive, int code){
-    assert(srcDir != "" && path != "");
+    assert(srcDir != "");
     if(mmFile_) { UnmapFile(); }
     code_ = code;
-    isKeepAlive_ = isKeepAlive_;
+    isKeepAlive_ = isKeepAlive;
     path_ = path;
     srcDir_ = srcDir;
     mmFile_ = nullptr; 
@@ -112,8 +112,8 @@ void HttpResponse::AddStateLine_(Buffer& buff) {
 void HttpResponse::AddHeader_(Buffer& buff) {
     buff.Append("Connection: ");
     if(isKeepAlive_) {
-        buff.Append("Keep-Alive\r\n");
-        buff.Append("Keep-Alive: timeout=10000\r\n");
+        buff.Append("keep-alive\r\n");
+        buff.Append("keep-alive: max=5, timeout=120\r\n");
     } else{
         buff.Append("close\r\n");
     }

diff --git a/code/log/log.cpp b/code/log/log.cpp
@@ -74,7 +74,7 @@ void Log::init(int level = 1, const char* path, const char* suffix,
         lock_guard<mutex> locker(mtx_);
         buff_.RetrieveAll();
         if(fp_) { 
-            fflush(fp_);
+            flush();
             fclose(fp_); 
         }
 
@@ -116,7 +116,7 @@ void Log::write(int level, const char *format, ...) {
         }
 
         locker.lock();
-        fflush(fp_);
+        flush();
         fclose(fp_);
         fp_ = fopen(newFile, "a");
         assert(fp_ != nullptr);
@@ -168,14 +168,11 @@ void Log::AppendLogLevelTitle_(int level) {
     }
 }
 
-void Log::flush(void) {
-    {
-        lock_guard<mutex> locker(mtx_);
-        fflush(fp_);
-    }
+void Log::flush() {
     if(isAsync_) { 
         deque_->flush(); 
     }
+    fflush(fp_);
 }
 
 void Log::AsyncWrite_() {

diff --git a/code/main.cpp b/code/main.cpp
@@ -10,9 +10,9 @@ int main() {
     /* 守护进程 后台运行 */
     //daemon(1, 0); 
     WebServer server(
-        1316, 3, 5000, false,        /* 端口 ET模式 timeoutMs  优雅退出  */
+        1316, 3, 60000, false,        /* 端口 ET模式 timeoutMs  优雅退出  */
         3306, "root", "root", "webserver", /* Mysql配置 */
-        12, 6, false, 0, 1024);              /* 连接池数量 线程池数量 日志开关 日志等级 日志异步队列容量 */
+        12, 6, true, 1, 1024);              /* 连接池数量 线程池数量 日志开关 日志等级 日志异步队列容量 */
     server.Start();
 } 
 
diff --git a/code/server/webserver.cpp b/code/server/webserver.cpp
@@ -175,8 +175,15 @@ void WebServer::OnRead_(HttpConn* client) {
         CloseConn_(client);
         return;
     }
-    client->process();
-    epoller_->ModFd(client->GetFd(), connEvent_ | EPOLLOUT);
+    OnProcess(client);
+}
+
+void WebServer::OnProcess(HttpConn* client) {
+    if(client->process()) {
+        epoller_->ModFd(client->GetFd(), connEvent_ | EPOLLOUT);
+    } else {
+        epoller_->ModFd(client->GetFd(), connEvent_ | EPOLLIN);
+    }
 }
 
 void WebServer::OnWrite_(HttpConn* client) {
@@ -187,9 +194,7 @@ void WebServer::OnWrite_(HttpConn* client) {
     if(client->ToWriteBytes() == 0) {
         /* 传输完成 */
         if(client->IsKeepAlive()) {
-            LOG_DEBUG("keepAlive!");
-            client->reset();
-            epoller_->ModFd(client->GetFd(), connEvent_ | EPOLLIN);
+            OnProcess(client);
             return;
         }
     }
@@ -236,7 +241,7 @@ bool WebServer::InitSocket_() {
 
     int optval = 1;
     /* 端口复用 */
-    /* 。但是，这些套接字并不是所有都能读取信息，只有最后一个套接字会正常接收数据。 */
+    /* 只有最后一个套接字会正常接收数据。 */
     ret = setsockopt(listenFd_, SOL_SOCKET, SO_REUSEADDR, (const void*)&optval, sizeof(int));
     if(ret == -1) {
         LOG_ERROR("set socket setsockopt error !");

diff --git a/code/server/webserver.h b/code/server/webserver.h
@@ -49,7 +49,8 @@ class WebServer {
 
     void OnRead_(HttpConn* client);
     void OnWrite_(HttpConn* client);
-
+    void OnProcess(HttpConn* client);
+
     static const int MAX_FD = 65536;
 
     static int SetFdNonblock(int fd);