basic error handling

2 years ago · 8cbefa68a8
8 changed files with 21 additions and 15 deletions
--- a/includes/webserv.hpp
+++ b/includes/webserv.hpp
@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <unistd.h>
-
 #include <algorithm>
 #include <cctype>
 #include <cerrno>
@ -56,7 +55,6 @@ string read_file(string path);
 #include "Nodes.hpp"
 #include "Token.hpp"
 #include "Parser.hpp"
-
 #include "Route.hpp"
 #include "Socket.hpp"
 #include "Server.hpp"
--- a/public/documents/test1
+++ b/public/documents/test1
@ -0,0 +1 @@
+===||This is a test file||===
--- a/public/documents/test2
+++ b/public/documents/test2
@ -0,0 +1 @@
+===||This is a test2 file||===
--- a/public/images/a_file
+++ b/public/images/a_file
@ -1,2 +0,0 @@
-jdkslaj\njkdsa;jfd\njdkaj;fjd
-jdkslaj\njkdsa;jfd\njdkaj;fjd
--- a/public/testsite/basique.html
+++ b/public/testsite/basique.html
@ -19,7 +19,7 @@
            document.querySelector('body').innerHTML = '<button class ="second" style="position: fixed; bottom: 0; left: 0; width: 100%; height: 50px; font-size: 20px; background-color: red; color: white;">CLIQUEZ ICI POUR VOIR VOTRE VRAI CADEAU</button>';
            const button2 = document.querySelector('button.second');
            button2.addEventListener('click', function () {
-                document.querySelector('body').innerHTML = '<img src="../images/monkey.gif" style="width: 100%; height: 100%;">';
+                document.querySelector('body').innerHTML = '<img src="./monkey.gif" style="width: 100%; height: 100%;">';
            });
        });
    </script>
--- a/public/testsite/basique.php
+++ b/public/testsite/basique.php
@ -3,6 +3,7 @@
  <title>PHP Test</title>
 </head>
 <body>
- <?php echo '<p>PHP page</p>'; ?>
+	<?php echo '<p>PHP page</p>'; ?><br>
+	<p>Copyright © NicoWalid <?php echo date("Y"); ?></p>
 </body>
 </html>
--- a/public/testsite/monkey.gif
+++ b/public/testsite/monkey.gif
--- a/srcs/webserv.cpp
+++ b/srcs/webserv.cpp
@ -6,16 +6,21 @@ int Socket::_min_fd = INT_MAX;
 int Socket::_amount = 0;

 int main(int ac, char **av) {
-
-	if (ac < 2) {
-		cout << "Usage:\n";
-		cout << "./webserv CONF.json\n";
-		cout << "WARNING: You must use a correct json syntax and a correct "
-				"server configuration or don't expect it to work correctly.";
-	} else if (ac == 2) {
+	if (ac <= 2) {
+		std::string config = "default.json";
+		if (ac == 2){
+			std::ifstream file(av[1]);
+			if (file.good())
+				config = av[1];
+			else {
+				std::cout << "Error: " << av[1] << " is not a valid file" << std::endl;
+				return EXIT_FAILURE;
+			}
+			config = av[1];
+		}
 		cout << "Parsing configuration file from JSON conf file.\n";
 		cout << "You must be sure the syntax is correct\n";
-		JSONParser parser(av[1]);
+		JSONParser parser(config);
 		JSONNode *conf = parser.parse();
 		cout << "Initialization of server...\n";
 		Env env(conf);
@ -34,5 +39,7 @@ int main(int ac, char **av) {
 			env.refresh();
 		}
 	}
+	else
+		cout << "Usage:\n./webserv CONF.json\n";
 	return (0);
 }