summary refs log tree commit diff homepage
path: root/src/MinecraftHandler.ts
diff options
context:
space:
mode:
authordestruc7i0n <dscdsouza@outlook.com>2020-02-05 22:07:14 -0500
committerdestruc7i0n <dscdsouza@outlook.com>2020-02-05 22:07:14 -0500
commit4d08955c59c35bcbe79a8e202fb947551e7470b8 (patch)
tree8686511d1d26a76592ea48c2db174c06fe4d1a3a /src/MinecraftHandler.ts
parentSome more cleanup (diff)
downloadshulker-4d08955c59c35bcbe79a8e202fb947551e7470b8.tar.gz
shulker-4d08955c59c35bcbe79a8e202fb947551e7470b8.zip
Allow specification of the channel name rather than id
Diffstat (limited to '')
-rw-r--r--src/MinecraftHandler.ts15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/MinecraftHandler.ts b/src/MinecraftHandler.ts
index 20bccf5..0e4e5d7 100644
--- a/src/MinecraftHandler.ts
+++ b/src/MinecraftHandler.ts
@@ -44,8 +44,10 @@ class MinecraftHandler {
     const logLineData = data.match(logLineDataRegex)
 
     if (!logLineDataRegex.test(data) || !logLineData) {
-      console.log('[ERROR] Regex could not match the string! Please verify it is correct!')
-      console.log('Received: "' + data + '", Regex matches lines that start with: "' + this.config.REGEX_SERVER_PREFIX + '"')
+      if (this.config.DEBUG) {
+        console.log('[DEBUG] Regex could not match the string:')
+        console.log('Received: "' + data + '", Regex matches lines that start with: "' + this.config.REGEX_SERVER_PREFIX + '"')
+      }
       return null
     }
 
@@ -164,7 +166,14 @@ class MinecraftHandler {
 
         mcPath = (defaultPath ? '/' : '') + path.join(mcPath, '/logs/latest.log')
 
-        console.log(`  \`tail -F ${mcPath} | grep --line-buffered ": <" | while read x ; do echo -ne $x | curl -X POST -d @- http://${url}:${port}${this.config.WEBHOOK} ; done\``)
+        let grepMatch = ': <'
+        if (this.config.SHOW_PLAYER_DEATH || this.config.SHOW_PLAYER_ME || this.config.SHOW_PLAYER_ADVANCEMENT || this.config.SHOW_PLAYER_CONN_STAT) {
+          grepMatch = this.config.REGEX_SERVER_PREFIX
+        }
+        console.log(`  \`tail -F ${mcPath} | grep --line-buffered "${grepMatch}" | while read x ; do echo -ne $x | curl -X POST -d @- http://${url}:${port}${this.config.WEBHOOK} ; done\``)
+        if (grepMatch !== ': <') {
+          console.log('       Please note that the above command can send a lot of requests to the server. Disable the non-text messages (such as "SHOW_PLAYER_CONN_STAT") to reduce this if necessary.')
+        }
       }
     })
   }