From 6b0f215d8b8f6a01558432333eca25b59eb0d339 Mon Sep 17 00:00:00 2001 From: Talyx Date: Tue, 22 Feb 2022 19:46:04 +0300 Subject: [PATCH] change: error output --- src/CGI/CgiHandle.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/CGI/CgiHandle.cpp b/src/CGI/CgiHandle.cpp index ce923e5..9358735 100644 --- a/src/CGI/CgiHandle.cpp +++ b/src/CGI/CgiHandle.cpp @@ -57,7 +57,8 @@ void CgiHandle::printSSmap(std::map &m) { std::map::iterator it; - DBOUT << RED << "print MAP" << ENDL; + DBOUT << WARNING << getDebugTime() << FAIL << " Print MAP" << ENDL; + it = m.begin(); for (; it != m.end(); it++) { @@ -67,6 +68,7 @@ void CgiHandle::printSSmap(std::map &m) void printenv(char **env) { + DBOUT << WARNING << getDebugTime() << FAIL << " Print env" << ENDL; for(size_t i = 0; env[i]; i++) { DBOUT << RED << env[i] << ENDL; @@ -88,9 +90,9 @@ std::string CgiHandle::executeCgi() { env = mapToCharPtr(); } - catch(const std::exception& e) + catch(const std::bad_alloc& e) { - std::cerr << RED << e.what() << RESET << '\n'; + std::cerr << WARNING << getDebugTime() << FAIL << " " << e.what() << ENDL; } sI = dup(STDIN_FILENO); sO = dup(STDOUT_FILENO); @@ -106,14 +108,14 @@ std::string CgiHandle::executeCgi() pid = fork(); if (pid == -1) { - std::cerr << RED << "Pid = -1. Fork error." << ENDL; + std::cerr << WARNING << getDebugTime() << FAIL << " Pid = -1. Fork error."<< ENDL; } else if (pid == 0) { dup2(fdin, STDIN_FILENO); dup2(fdOut, STDOUT_FILENO); execve(_response.getCgiPass().c_str(), argv, env); - std::cerr << RED << "Execve error." << RESET << ENDL; + std::cerr << WARNING << getDebugTime() << FAIL << " Execve error." << ENDL; write(STDOUT_FILENO, "Status: 500\r\n\r\n", 15); } else