Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion server/src/main/java/org/web1/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@
import org.web1.utils.JsonBuilder;
import org.web1.utils.QueryStringToHashmap;
import org.web1.utils.ResponseController;
import org.web1.utils.Timer;

public class Main {
private static final Function<String, HashMap<String,String>> parseQuery = new QueryStringToHashmap();
private static final CheckerFunction checker = new Checker();

public static void main(String[] args) {
FCGIInterface fastCGI = new FCGIInterface();
Timer timer = new Timer();

while (fastCGI.FCGIaccept() >= 0) {
timer.start();

HashMap<String, String> queryParams = parseQuery.apply(
FCGIInterface.request.params.getProperty("QUERY_STRING")
);
Expand All @@ -26,7 +30,7 @@ public static void main(String[] args) {
String result = ResponseController.create(
new JsonBuilder()
.add("result", checkResult)
.add("elapsedTime", 100)
.add("elapsedTimeNs", timer.stop())
);

System.out.println(result);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ public enum GraphQuarters {
FIRST_QUADRANT,
SECOND_QUADRANT,
THIRD_QUADRANT,
FORTH_QUADRANT, FOURTH_QUADRANT
FOURTH_QUADRANT
}
6 changes: 4 additions & 2 deletions server/src/main/java/org/web1/utils/JsonBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ public <T> JsonBuilder add(String key, T value) {
}

public String build() {
if (data.isEmpty()) return "{}";

StringBuilder jsonString = new StringBuilder("{\n");

for (String key : data.keySet())
jsonString.append(String.format("\t%s: %s,\n", key, data.get(key)));
jsonString.append(String.format("\t\"%s\": %s,\n", key, data.get(key)));

return jsonString + "}";
return jsonString.substring(0, jsonString.length() - 2) + "\n}";
}
}
5 changes: 2 additions & 3 deletions server/src/main/java/org/web1/utils/ResponseController.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ public class ResponseController {
Connection: keep-alive
Content-Type: application/json
Content-Length: %d
\s
%s
\s""";

%s""";
public static String create(JsonBuilder jsonBuilder) {
String response = jsonBuilder.build();
return String.format(BASE_RESPONSE, response.length(), response);
Expand Down
11 changes: 11 additions & 0 deletions server/src/main/java/org/web1/utils/Timer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.web1.utils;

public class Timer {
long startTime;
public void start() {
this.startTime = System.nanoTime();
}
public long stop() {
return System.nanoTime() - this.startTime;
}
}