Changeset 294 for scripts/usr/local/lib/7dtd/monitor-log.sh

Timestamp:

Oct 6, 2016, 4:45:58 PM (8 years ago)

Author:

alloc

Message:

Scripts 103

File:

• scripts/usr/local/lib/7dtd/monitor-log.sh (modified) (2 diffs)

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -39 +39 @@
         local steamId="$3"
         local ip="$4"
+        local ownerId="$5"
         
-        logPlayerConnect $INSTANCE "$entityId" "$name" "$steamId" "$ip"
+        logPlayerConnect $INSTANCE "$entityId" "$name" "$steamId" "$ip" "$ownerId"
 
         for H in $(getHooksFor playerConnect $INSTANCE); do
-                $H $INSTANCE "$entityId" "$name" "$steamId" "$ip"
+                $H $INSTANCE "$entityId" "$name" "$steamId" "$ip" "$ownerId"
         done
 }
@@ -121 +122 @@
 while read line ; do
         if [ -n "$line" ]; then
-                #Player connected, entityid=1278, name=termo2, steamid=76561197997439820, ip=178.203.27.140 
-                #Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=[0-9.]*$ 
+                #Player connected, entityid=1278, name=termo2, steamid=76561197997439820, steamOwner=76561197997439820, ip=178.203.27.140 
+                #Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, steamOwner=[0-9]*, ip=[0-9.]*$ 
                 if [ -n "$(echo "$line" | grep '^Player connected,')" ]; then
-                        entityId=$(expr "$line" : 'Player connected, entityid=\([0-9]*\), name=.*, steamid=[0-9]*, ip=[0-9.]*$')
-                        playerName=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=\(.*\), steamid=[0-9]*, ip=[0-9.]*$')
-                        steamId=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=\([0-9]*\), ip=[0-9.]*$')
-                        ip=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=\([0-9.]*\)$')
+                        entityId=$(expr "$line" : 'Player connected, entityid=\([0-9]*\), name=.*, steamid=[0-9]*, steamOwner=[0-9]*, ip=[0-9.]*$')
+                        playerName=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=\(.*\), steamid=[0-9]*, steamOwner=[0-9]*, ip=[0-9.]*$')
+                        steamId=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=\([0-9]*\), steamOwner=[0-9]*, ip=[0-9.]*$')
+                        steamOwner=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, steamOwner=\([0-9]*\), ip=[0-9.]*$')
+                        ip=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, steamOwner=[0-9]*, ip=\([0-9.]*\)$')
                         sleep 1
-                        handleConnect "$entityId" "$playerName" "$steamId" "$ip"
-                        unset entityId playerName steamId ip
+                        handleConnect "$entityId" "$playerName" "$steamId" "$ip" "$steamOwner"
+                        unset entityId playerName steamId steamOwner ip
                 else
                 #Player disconnected: EntityID=[0-9]*, PlayerID='[0-9]*', OwnerID='[0-9]*', PlayerName='.*'$