2008-06-20 Ramon Novoa <rnovoa@artica.es>
* openWRT/pandora_agent, openWRT/pandora_agent.conf: Added support for Tentacle. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@891 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
dc6e7d6fe2
commit
ca7961a828
|
@ -1,3 +1,8 @@
|
||||||
|
2008-06-20 Ramon Novoa <rnovoa@artica.es>
|
||||||
|
|
||||||
|
* openWRT/pandora_agent, openWRT/pandora_agent.conf: Added support for
|
||||||
|
Tentacle.
|
||||||
|
|
||||||
2008-06-19 Ramon Novoa <rnovoa@artica.es>
|
2008-06-19 Ramon Novoa <rnovoa@artica.es>
|
||||||
|
|
||||||
* win32/bin/PandoraAgent.exe: Updated to r888.
|
* win32/bin/PandoraAgent.exe: Updated to r888.
|
||||||
|
|
|
@ -41,9 +41,9 @@ IFS="
|
||||||
# Default values
|
# Default values
|
||||||
CHECKSUM_MODE=1
|
CHECKSUM_MODE=1
|
||||||
DEBUG_MODE=0
|
DEBUG_MODE=0
|
||||||
SERVER_PORT=21
|
SERVER_PORT=41121
|
||||||
INTERVAL=300
|
INTERVAL=300
|
||||||
TRANSFER_MODE=ftp
|
TRANSFER_MODE=tentacle
|
||||||
SERVER_PWD=pandora123
|
SERVER_PWD=pandora123
|
||||||
if [ -z "`echo $LANG | grep '\.'`" ]
|
if [ -z "`echo $LANG | grep '\.'`" ]
|
||||||
then
|
then
|
||||||
|
@ -114,6 +114,11 @@ do
|
||||||
SERVER_PWD=`echo $a | awk '{ print $2 }' `
|
SERVER_PWD=`echo $a | awk '{ print $2 }' `
|
||||||
echo "$TIMESTAMP - [SETUP] - Server password set (FTP)" >> $PANDORA_LOGFILE
|
echo "$TIMESTAMP - [SETUP] - Server password set (FTP)" >> $PANDORA_LOGFILE
|
||||||
fi
|
fi
|
||||||
|
if [ ! -z "`echo $a | grep -e '^transfer_mode'`" ]
|
||||||
|
then
|
||||||
|
TRANSFER_MODE=`echo $a | awk '{ print $2 }' `
|
||||||
|
echo "$TIMESTAMP - [SETUP] - Transfer mode is $TRANSFER_MODE" >> $PANDORA_LOGFILE
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
@ -268,7 +273,13 @@ do
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $TEMP
|
cd $TEMP
|
||||||
|
if [ "$TRANSFER_MODE" = "ftp" ]
|
||||||
|
then
|
||||||
wput -q $NOMBRE_HOST.$SERIAL.data ftp://pandora:$SERVER_PWD@$SERVER_IP:$SERVER_PORT
|
wput -q $NOMBRE_HOST.$SERIAL.data ftp://pandora:$SERVER_PWD@$SERVER_IP:$SERVER_PORT
|
||||||
|
else
|
||||||
|
tentacle_client -a $SERVER_IP -p $SERVER_PORT $NOMBRE_HOST.$SERIAL.data
|
||||||
|
fi
|
||||||
|
|
||||||
# Delete data
|
# Delete data
|
||||||
rm -f $DATA 2> $PANDORA_LOGFILE.err
|
rm -f $DATA 2> $PANDORA_LOGFILE.err
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,11 @@ agent_name arduinoasus
|
||||||
# By default agent try to take default encoding defined in host.
|
# By default agent try to take default encoding defined in host.
|
||||||
# encoding iso-8859-15
|
# encoding iso-8859-15
|
||||||
|
|
||||||
# By default is 21 for ftp
|
# 41121 by default.
|
||||||
server_port 21
|
server_port 41121
|
||||||
|
|
||||||
# only ftp at this time.
|
# tentacle by default. ftp or tentacle.
|
||||||
transfer_mode ftp
|
transfer_mode tentacle
|
||||||
|
|
||||||
# server pass
|
# server pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue