diff --git a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java index 3b906d0..fb53259 100644 --- a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java +++ b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/BotController.java @@ -7,8 +7,10 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ui.Model; import java.util.List; +import lombok.extern.slf4j.Slf4j; @Controller +@Slf4j public class BotController { @Autowired @@ -16,7 +18,7 @@ public class BotController { @GetMapping("/viewbot") public String listAll(Model model) { - System.out.println("WebHandler::viewbot"); + log.info("WebHandler::viewbot"); List botlist = botRepo.findAll(); model.addAttribute("bots", botlist); @@ -26,7 +28,7 @@ public class BotController { @GetMapping("/makebot") public String makebotget(Model model) { - System.out.println("WebHandler::makebot"); + log.info("WebHandler::makebot"); Bot bot = new Bot(); model.addAttribute("bot", bot); @@ -36,7 +38,7 @@ public class BotController { @PostMapping("/makebot") public String makebotpost(@ModelAttribute("bot") Bot bot) { - System.out.println(bot); + //log.info(bot); botRepo.save(bot); diff --git a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/WebHandler.java b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/WebHandler.java index 56a0629..0561e51 100644 --- a/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/WebHandler.java +++ b/Java/Spring/activitypubbot/src/main/java/dev/activitypub/activitypubbot/WebHandler.java @@ -3,11 +3,15 @@ package dev.activitypub.activitypubbot; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; +import lombok.extern.slf4j.Slf4j; +import java.time.Instant; +import java.time.format.DateTimeFormatter; /** * Here we handle all non-JSON/REST requests - i.e. the normal "web" view */ @Controller +@Slf4j public class WebHandler { @Autowired @@ -19,12 +23,12 @@ public class WebHandler { */ @RequestMapping("/@springbot") public String atactor() { - System.out.println("WebHandler::atactor"); + log.info("WebHandler::atactor"); return this.actor(); } @RequestMapping("/users/springbot") public String actor() { - System.out.println("WebHandler::actor"); + log.info("WebHandler::actor"); return "index"; // just flinging out the index page for now } @@ -33,19 +37,19 @@ public class WebHandler { */ @RequestMapping("/") public String root() { - System.out.println("WebHandler::root"); + log.info("WebHandler::root"); return "index"; } /* // TODO: presumably there is some way to map things like / to capture string and attempt to resolve template @RequestMapping("/viewbot") public String viewbot() { - System.out.println("WebHandler::viewbot"); + log.info("WebHandler::viewbot"); return "viewbot"; } @RequestMapping("/makebot") public String makebot() { - System.out.println("WebHandler::makebot"); + log.info("WebHandler::makebot"); return "makebot"; } */ diff --git a/Java/Spring/activitypubbot/src/main/resources/application.properties b/Java/Spring/activitypubbot/src/main/resources/application.properties index 1006740..93409ec 100644 --- a/Java/Spring/activitypubbot/src/main/resources/application.properties +++ b/Java/Spring/activitypubbot/src/main/resources/application.properties @@ -2,6 +2,10 @@ spring.application.name=activitypubbot springbot.domain=springbot.seth.id.au springbot.scheme=https +logging.file.name=logs/springbot.log +logging.file.path=logs +spring.output.ansi.enabled=ALWAYS + spring.mvc.view.prefix: /WEB-INF/views/ spring.mvc.view.suffix: .jsp