From d1e1af669d553c65ac1f13f9dd61864717c403aa Mon Sep 17 00:00:00 2001
From: Armin <armin.felder@osalliance.com>
Date: Mon, 25 Dec 2017 18:05:47 +0100
Subject: [PATCH] added NotFound
---
CMakeLists.txt | 2 +-
Dockerfile | 3 ++-
HandlerFactory.cpp | 2 +-
HandlerFactory.h | 2 +-
.../{TestHandler.cpp => NorFoundHandler.cpp} | 20 +++++++++----------
handlers/{TestHandler.h => NorFoundHandler.h} | 4 ++--
main.cpp | 2 +-
7 files changed, 18 insertions(+), 17 deletions(-)
rename handlers/{TestHandler.cpp => NorFoundHandler.cpp} (79%)
rename handlers/{TestHandler.h => NorFoundHandler.h} (97%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f6d80d..2e7d5bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(RocketChatMobilePushGateway)
set(CMAKE_CXX_STANDARD 14)
include_directories(/usr/local/include/r3/)
-set(SOURCE_FILES main.cpp HandlerFactory.cpp handlers/TestHandler.cpp utils.cpp utils.h handlers/ApplePushHandler.cpp handlers/ApplePushHandler.h handlers/GooglePushHandler.cpp handlers/GooglePushHandler.h models/GooglePushModel.cpp models/GooglePushModel.h models/ApplePushModel.cpp models/ApplePushModel.h)
+set(SOURCE_FILES main.cpp HandlerFactory.cpp handlers/NorFoundHandler.cpp utils.cpp utils.h handlers/ApplePushHandler.cpp handlers/ApplePushHandler.h handlers/GooglePushHandler.cpp handlers/GooglePushHandler.h models/GooglePushModel.cpp models/GooglePushModel.h models/ApplePushModel.cpp models/ApplePushModel.h)
add_executable(rocketChatMobilePushGateway ${SOURCE_FILES} utils.cpp utils.h models/GooglePushModel.cpp models/GooglePushModel.h)
target_link_libraries(rocketChatMobilePushGateway -lwangle -lfolly -lz -lssl -lcrypto -levent -lgflags -lglog -L/usr/lib64 -lpthread -pthread -lfolly -lglog -ldouble-conversion -lboost_system -lboost_thread -lproxygenhttpserver -ljsoncpp -lcurl)
diff --git a/Dockerfile b/Dockerfile
index 61f58a3..ee8501b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,6 +70,7 @@ RUN mkdir /pushGateway \
RUN ln -s /certs /pushGateway/RocketChatMobilePushGateway/credentials
+EXPOSE 11000
+
ENTRYPOINT ["/pushGateway/RocketChatMobilePushGateway/rocketChatMobilePushGateway"]
-EXPOSE 11000
diff --git a/HandlerFactory.cpp b/HandlerFactory.cpp
index ef5a600..01337c9 100644
--- a/HandlerFactory.cpp
+++ b/HandlerFactory.cpp
@@ -44,5 +44,5 @@ RequestHandler* HandlerFactory::onRequest(RequestHandler* requestHandler, HTTPMe
}
}
}
- return new TestHandler();
+ return new NotFoundHandler();
}
diff --git a/HandlerFactory.h b/HandlerFactory.h
index 84c8db0..128935d 100644
--- a/HandlerFactory.h
+++ b/HandlerFactory.h
@@ -26,7 +26,7 @@
#include <proxygen/httpserver/RequestHandler.h>
#include <proxygen/httpserver/RequestHandlerFactory.h>
-#include "handlers/TestHandler.h"
+#include "handlers/NorFoundHandler.h"
#include "utils.h"
#include "handlers/ApplePushHandler.h"
#include "handlers/GooglePushHandler.h"
diff --git a/handlers/TestHandler.cpp b/handlers/NorFoundHandler.cpp
similarity index 79%
rename from handlers/TestHandler.cpp
rename to handlers/NorFoundHandler.cpp
index 7b8875a..fa6df27 100644
--- a/handlers/TestHandler.cpp
+++ b/handlers/NorFoundHandler.cpp
@@ -18,17 +18,17 @@
* *
********************************************************************************************************************/
-#include "TestHandler.h"
+#include "NorFoundHandler.h"
-TestHandler::TestHandler() {
+NotFoundHandler::NotFoundHandler() {
}
-void TestHandler::onRequest(std::unique_ptr<proxygen::HTTPMessage> headers) noexcept {
+void NotFoundHandler::onRequest(std::unique_ptr<proxygen::HTTPMessage> headers) noexcept {
}
-void TestHandler::onBody(std::unique_ptr<folly::IOBuf> body) noexcept {
+void NotFoundHandler::onBody(std::unique_ptr<folly::IOBuf> body) noexcept {
if(mBody){
mBody->prependChain(std::move(body));
} else{
@@ -36,19 +36,19 @@ void TestHandler::onBody(std::unique_ptr<folly::IOBuf> body) noexcept {
}
}
-void TestHandler::onEOM() noexcept {
- ResponseBuilder(downstream_).status(200, "OK")
- .header("Set-Cookie", "test=123;Max-Age=60").body("Hello World").sendWithEOM();
+void NotFoundHandler::onEOM() noexcept {
+ ResponseBuilder(downstream_).status(404, "NOT FOUND")
+ .header("Set-Cookie", "test=123;Max-Age=60").body("not found").sendWithEOM();
}
-void TestHandler::onUpgrade(proxygen::UpgradeProtocol proto) noexcept {
+void NotFoundHandler::onUpgrade(proxygen::UpgradeProtocol proto) noexcept {
}
-void TestHandler::requestComplete() noexcept {
+void NotFoundHandler::requestComplete() noexcept {
delete this;
}
-void TestHandler::onError(proxygen::ProxygenError err) noexcept {
+void NotFoundHandler::onError(proxygen::ProxygenError err) noexcept {
}
\ No newline at end of file
diff --git a/handlers/TestHandler.h b/handlers/NorFoundHandler.h
similarity index 97%
rename from handlers/TestHandler.h
rename to handlers/NorFoundHandler.h
index 3e52b5e..cf84316 100644
--- a/handlers/TestHandler.h
+++ b/handlers/NorFoundHandler.h
@@ -29,9 +29,9 @@
using namespace proxygen;
-class TestHandler : public RequestHandler{
+class NotFoundHandler : public RequestHandler{
public:
- TestHandler();
+ NotFoundHandler();
void onRequest(std::unique_ptr<proxygen::HTTPMessage> headers) noexcept override ;
diff --git a/main.cpp b/main.cpp
index 1a69edd..484182c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,7 +38,7 @@ using Protocol = HTTPServer::Protocol;
DEFINE_int32(http_port, 11000, "Port to listen on with HTTP protocol");
DEFINE_int32(spdy_port, 11001, "Port to listen on with SPDY protocol");
DEFINE_int32(h2_port, 11002, "Port to listen on with HTTP/2 protocol");
-DEFINE_string(ip, "localhost", "IP/Hostname to bind to");
+DEFINE_string(ip, "0.0.0.0", "IP/Hostname to bind to");
DEFINE_int32(threads, 0, "Number of threads to listen on. Numbers <= 0 "
"will use the number of cores on this machine.");
--
GitLab