Merge pull request #1 from nypi/file_logs

File logs

Author: nypi

README.md

@@ -257,22 +257,28 @@ TODO
 
 ```
 match
+num_bots {NUM_BOTS}
+##MatchConfig
 mode {MATCH_MODE}
 num_rounds {NUM_ROUNDS}
-num_bots {NUM_BOTS}
+random_seed {RANDOM_SEED}
+move_time_limit {MOVE_TIME_LIMIT}
+coin_spawn_period {COIN_SPAWN_PERIOD}
+coin_spawn_volume {COIN_SPAWN_VOLUME}
+##MapConfig
 map_size {MAP_WIDTH} {MAP_HEIGHT}
 view_radius {VIEW_RADIUS}
 mining_radius {MINING_RADIUS}
 attack_radius {ATTACK_RADIUS}
-move_time_limit {MOVE_TIME_LIMIT}
+block {X} {Y}
+##BotsAndCoinsInfo
 bot_name {BOT_ID} {BOT_NAME}
 bot {BOT_ID} {X} {Y}
 bot_coins {BOT_ID} {NUM_COINS}
-block {X} {Y}
 coin {X} {Y}
 round {ROUND}
 bot {BOT_ID} {X} {Y}
-bot_coins {BOT_ID} {X} {Y}
+bot_coins {BOT_ID} {NUM_COINS}
 attack {BOT_1_ID} {BOT_2_ID}
 coin_collected {X} {Y} {BOT_ID}
 coin {X} {Y}

common/src/main/java/ru/croccode/hypernull/geometry/Point.java

@@ -113,4 +113,8 @@ public int hashCode() {
 	public String toString() {
 		return "(" + x + ", " + y + ")";
 	}
+
+	public String toLog() {
+		return x + " " + y;
+	}
 }

server/hypernull.properties

@@ -1 +1,2 @@
 server.port=2021
+match.log.folder=./matchlogs/

server/src/main/java/ru/croccode/hypernull/match/Match.java

@@ -365,4 +365,23 @@ private void collectCoins() {
 			}
 		}
 	}
+
+	public void finished() {
+		//TODO Надо ли оповещать через MatchListener, что матч совсем всё?
+		for (MatchListener<K> listener : listeners) {
+			try {
+				listener.close();
+			} catch (Exception e) {
+				throw new RuntimeException(
+                    String.format(
+                        "Ошибка при закрытии слушателя %s матча %s: %s",
+                        listener.getClass().getSimpleName(),
+                        this,//TODO id?
+                        e.getMessage()
+				    ),
+                    e
+                );
+			}
+		}
+	}
 }

server/src/main/java/ru/croccode/hypernull/match/MatchConfig.java

@@ -5,11 +5,11 @@
 
 public class MatchConfig {
 
-	private final long randomSeed;
+	private final MatchMode mode;
 
 	private final int numRounds;
 
-	private final MatchMode mode;
+	private final long randomSeed;
 
 	private final long moveTimeLimit;
 

server/src/main/java/ru/croccode/hypernull/match/MatchListener.java

@@ -5,7 +5,7 @@
 import ru.croccode.hypernull.domain.MatchMap;
 import ru.croccode.hypernull.geometry.Point;
 
-public interface MatchListener<K> {
+public interface MatchListener<K> extends AutoCloseable{
 
 	void matchStarted(MatchMap map, MatchConfig config, Map<K, String> botNames);
 

server/src/main/java/ru/croccode/hypernull/server/AsciiMatchPrinter.java

@@ -33,6 +33,11 @@ public class AsciiMatchPrinter implements MatchListener<Integer> {
 
 	private int round;
 
+	@Override
+	public void close() {
+		//nothing
+	}
+
 	static class BotState {
 
 		String name = Strings.empty();

server/src/main/java/ru/croccode/hypernull/server/HyperNull.java

@@ -34,13 +34,16 @@ public class HyperNull implements Runnable, Closeable {
 	private final MapRegistry mapRegistry;
 
 	private final Server server;
+	private final String matchLogsFolder;
 
 	public HyperNull(Properties properties) throws IOException {
 		Check.notNull(properties);
 		mapRegistry = new RandomMapRegistry(); // TODO implement MapRegistry
 		// start server
 		int serverPort = Integer.parseInt(
 				properties.getProperty("server.port", "2021"));
+
+		matchLogsFolder = properties.getProperty("match.log.folder","./matchlogs/");
 		this.server = new Server(serverPort);
 	}
 
@@ -87,7 +90,8 @@ private void runMatch(MatchMode mode, List<MatchRequest> matchRequests) {
 		MatchMap map = mapRegistry.randomMap(numBots);
 		MatchConfig config = buildMatchConfig(mode, map);
 		List<MatchListener<Integer>> listeners = Arrays.asList(
-				new AsciiMatchPrinter()
+				new AsciiMatchPrinter(),
+				new MatchFileLogger<>(this.matchLogsFolder)
 		);
 		Match<Integer> match = new Match<>(map, config, botNames, listeners);
 		new MatchRunner(match, botSessions).run();
@@ -109,6 +113,7 @@ public void close() throws IOException {
 	}
 
 	public static void main(String[] args) throws IOException {
+		System.out.println("Запуск сервера...");
 		String configPath = args.length > 0
 				? args[0]
 				: "hypernull.properties";

server/src/main/java/ru/croccode/hypernull/server/MatchFileLogger.java

@@ -0,0 +1,137 @@
+package ru.croccode.hypernull.server;
+
+import ru.croccode.hypernull.domain.MatchMap;
+import ru.croccode.hypernull.geometry.Point;
+import ru.croccode.hypernull.geometry.Size;
+import ru.croccode.hypernull.match.MatchConfig;
+import ru.croccode.hypernull.match.MatchListener;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.UUID;
+
+public class MatchFileLogger<K> implements MatchListener<K> {
+
+    private final static String LOG_FILE_TEMPLATE = "%s/Match_log_%s.txt";
+
+    private final UUID matchId;
+    private final PrintWriter logWriter;
+
+    public MatchFileLogger(String logsFolder) {
+        this.matchId = UUID.randomUUID();
+        Path path = Paths.get(logsFolder);
+        try {
+            Files.createDirectories(path);
+            final String logFileName = String.format(LOG_FILE_TEMPLATE, logsFolder, matchId);
+            this.logWriter = new PrintWriter(logFileName);
+        } catch (IOException ex) {
+            throw new RuntimeException(
+                "Ошибка инициализации логера в файл: " + ex.getMessage(),
+                ex
+            );
+        }
+    }
+
+    @Override
+    public void matchStarted(MatchMap map, MatchConfig config, Map<K, String> botNames) {
+        write("match");
+        write("num_bots " + botNames.size());
+        write("##MatchConfig");
+        printAllFields(config);
+        write("##MapConfig");
+        final Size mapSize = map.getSize();
+        write("map_size " + mapSize.width() + " " + mapSize.height());
+        write("view_radius " + map.getViewRadius());
+        write("mining_radius " + map.getMiningRadius());
+        write("attack_radius " + map.getAttackRadius());
+        printAllBlocks(map);
+        write("##BotsAndCoinsInfo");
+        for (Map.Entry<K, String> botEntry : botNames.entrySet()) {
+            write("bot_name " + botEntry.getKey() + " " + botEntry.getValue());
+        }
+    }
+
+    private void printAllBlocks(MatchMap map) {
+        for (int row = 0; row < map.getHeight(); row++) {
+            for (int column = 0; column < map.getWidth(); column++) {
+                Point somePoint = new Point(column, row);
+                if (map.isBlocked(somePoint)) {
+                    write("block " + somePoint.toLog());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void matchRound(int round) {
+        write("round " + round);
+    }
+
+    @Override
+    public void coinSpawned(Point position) {
+        write("coin " + position.toLog());
+    }
+
+    @Override
+    public void coinCollected(Point position, K botKey) {
+        write("coin_collected " + position.toLog() + " " + botKey);
+    }
+
+    @Override
+    public void botSpawned(K botKey, Point position) {
+        botMoved(botKey, position);
+    }
+
+    @Override
+    public void botMoved(K botKey, Point position) {
+        write("bot " + botKey + " " + position.toLog());
+    }
+
+    @Override
+    public void attack(K attackingKey, K defendingKey) {
+        write("attack " + attackingKey + " " + defendingKey);
+    }
+
+    @Override
+    public void botCoinsChanged(K botKey, int numCoins) {
+        write("bot_coins " + botKey + " " + numCoins); //TODO надо ли выводить предыдущее кол-во монет?
+    }
+
+    @Override
+    public void matchOver(K botKey) {
+        write("match_over " + botKey);
+    }
+
+    private void write(String msg) {
+        logWriter.println(msg);
+        logWriter.flush();
+    }
+    @Override
+    public void close() {
+        logWriter.close();
+    }
+
+    private void printAllFields(Object someObj) {
+        final Class<?> objClass = someObj.getClass();
+        for (Field declaredField : objClass.getDeclaredFields()) {
+            try {
+                declaredField.setAccessible(true);
+                final String filedName = declaredField.getName()
+                    .replaceAll("([A-Z][a-z])", "_$1")
+                    .toLowerCase();
+                write(filedName + " " + declaredField.get(someObj));
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(
+                    "Ошибка получения значения поля для класса " + objClass.getSimpleName()
+                        + " через рефлексию: " + e.getMessage(),
+                    e
+                );
+            }
+        }
+    }
+}

server/src/main/java/ru/croccode/hypernull/server/MatchRunner.java

@@ -93,7 +93,7 @@ public void run() {
 			}
 			match.completeRound(botMoves);
 		}
-
+		match.finished();
 		new ArrayList<>(botSessions.keySet()).forEach(this::closeSession);
 	}