summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoe Robinson <joe@lc8n.com>2015-12-11 17:33:54 +0000
committerJoe Robinson <joe@lc8n.com>2015-12-11 17:33:54 +0000
commit68923c16dff65b54851d0084b5058a927a896f44 (patch)
tree5f58efc1934e6c11b4063e70f2c43802826b7c3e /src
parentd8e6a1cf88ef10bd81d5e3c482919be2b5b3bc13 (diff)
Add some formatting to messages
Diffstat (limited to 'src')
-rw-r--r--src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java8
-rw-r--r--src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
index b5e9df9..7b3a1aa 100644
--- a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
+++ b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
@@ -35,17 +35,17 @@ public class GitMergeController {
String actionTxt = "";
if (action.equals("open")) {
- actionTxt = " created a merge request from ";
+ actionTxt = " created a merge request from [";
} else if (action.equals("merge")) {
- actionTxt = " merged from branch ";
+ actionTxt = " merged from branch [";
} else if (!action.equals("update")){
- actionTxt = " did a " + mergeMsg.getObjectAttributes().getAction() + " from ";
+ actionTxt = " did a " + mergeMsg.getObjectAttributes().getAction() + " from [";
} else {
log.info ("Dropping update message");
return "gitlab";
}
- String command = "echo theblueroom " + user + actionTxt + source + " to " + target + " on " + repo + ": [" + title + "] "+ url + " | bash /home/smsd/msgrelay.bash ";
+ String command = "echo theblueroom " + user + actionTxt + source + "] to [" + target + "] on <" + repo + ">: [" + title + "] "+ url + " | bash /home/smsd/msgrelay.bash ";
log.info("Running command: " + command);
//DANGER
Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", command});
diff --git a/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java b/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java
index ab9971d..73d1b4b 100644
--- a/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java
+++ b/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java
@@ -39,7 +39,7 @@ public class GitPushController {
log.info("Received commits: " + commitMsg);
//DANGER
- String command = "echo theblueroom " + pushMsg.getUserName() + " pushed to " + pushMsg.getRepository().getName() + ": "+ commitMsg + " | bash /home/smsd/msgrelay.bash ";
+ String command = "echo theblueroom " + pushMsg.getUserName() + " pushed to <" + pushMsg.getRepository().getName() + ">: "+ commitMsg + " | bash /home/smsd/msgrelay.bash ";
log.info("Running command: " + command);
Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", command});