roberto/PiGarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Variato emissione log chiamate alle callback dei driver

Browse Source
This commit is contained in:
lejubila
2017-08-16 16:37:35 +02:00
parent 317781e217
commit 2056b30be0
6 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/piGarden.conf.example
View File

@@ -2,6 +2,9 @@
LOG_FILE="/home/pi/piGarden/log/piGarden.log" LOG_FILE="/home/pi/piGarden/log/piGarden.log"
LOG_FILE_MAX_SIZE=1048576 # 1MB LOG_FILE_MAX_SIZE=1048576 # 1MB
# Log file for driver output
LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"
# Status directory # Status directory
STATUS_DIR="/home/pi/piGarden/state" STATUS_DIR="/home/pi/piGarden/state"

2
drv/sample/init.include.sh
View File

@@ -3,7 +3,7 @@
# #
function drv_sample_init { function drv_sample_init {
echo "$(date) drv_sample_init" >> /tmp/piGarden.drv.sample local FOO="bar"
} }

4
drv/sample/rainsensor.include.sh
View File

@@ -5,7 +5,7 @@
# #
function drv_sample_rain_sensor_init { function drv_sample_rain_sensor_init {
echo "$(date) drv_sample_rain_sensor_init $1" >> /tmp/piGarden.drv.sample local FOO="bar"
} }
@@ -16,7 +16,7 @@ function drv_sample_rain_sensor_init {
# #
function drv_sample_rain_sensor_get { function drv_sample_rain_sensor_get {
echo "$(date) drv_sample_rain_sensor_get $1" >> /tmp/piGarden.drv.sample local FOO="bar"
} }

6
drv/sample/rele.include.sh
View File

@@ -5,7 +5,7 @@
# #
function drv_sample_rele_init { function drv_sample_rele_init {
echo "$(date) drv_sample_rele_init $1" >> /tmp/piGarden.drv.sample local FOO="bar"
} }
@@ -16,7 +16,7 @@ function drv_sample_rele_init {
# #
function drv_sample_rele_open { function drv_sample_rele_open {
echo "$(date) drv_sample_rele_open $1" >> /tmp/piGarden.drv.sample local FOO="bar"
} }
@@ -27,7 +27,7 @@ function drv_sample_rele_open {
# #
function drv_sample_rele_close { function drv_sample_rele_close {
echo "$(date) drv_sample_rele_close $1" >> /tmp/piGarden.drv.sample local FOO="bar"
} }

7
drv/sample/supply.include.sh
View File

@@ -6,7 +6,8 @@
# #
function drv_sample_supply_bistable_init { function drv_sample_supply_bistable_init {
echo "$(date) drv_sample_supply_bistable_init $1 $2" >> /tmp/piGarden.drv.sample local FOO="bar"
} }
# #
@@ -17,7 +18,7 @@ function drv_sample_supply_bistable_init {
# #
function drv_sample_supply_positive { function drv_sample_supply_positive {
echo "$(date) drv_sample_supply_positive $1 $2" >> /tmp/piGarden.drv.sample local FOO="bar"
} }
@@ -29,7 +30,7 @@ function drv_sample_supply_positive {
# #
function drv_sample_supply_negative { function drv_sample_supply_negative {
echo "$(date) drv_sample_supply_negative $1 $2" >> /tmp/piGarden.drv.sample local FOO="bar"
} }

31
include/drv.include.sh
View File

@@ -85,7 +85,8 @@ function drv_rele_init {
log_write "Driver not found: $idx" log_write "Driver not found: $idx"
message_write "warning" "Driver not found: $idx" message_write "warning" "Driver not found: $idx"
else else
$fnc "$idx" echo "$(date) $fnc arg:$idx" > "$LOG_OUTPUT_DRV_FILE"
$fnc "$idx" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
} }
@@ -106,7 +107,8 @@ function drv_rele_close {
log_write "Driver not found: $idx" log_write "Driver not found: $idx"
message_write "warning" "Driver not found: $idx" message_write "warning" "Driver not found: $idx"
else else
$fnc "$idx" echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
$fnc "$idx" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
} }
@@ -127,7 +129,8 @@ function drv_rele_open {
log_write "Driver not found: $idx" log_write "Driver not found: $idx"
message_write "warning" "Driver not found: $idx" message_write "warning" "Driver not found: $idx"
else else
$fnc "$idx" echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
$fnc "$idx" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
} }
@@ -153,7 +156,8 @@ function drv_supply_bistable_init {
message_write "warning" "Driver not found: $idx1" message_write "warning" "Driver not found: $idx1"
return return
else else
$fnc1 "$idx1" echo "$(date) $fnc1 arg:$idx1" >> "$LOG_OUTPUT_DRV_FILE"
$fnc1 "$idx1" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
# Nessun driver definito, esegue l'operazione tramite gpio del raspberry # Nessun driver definito, esegue l'operazione tramite gpio del raspberry
@@ -165,7 +169,8 @@ function drv_supply_bistable_init {
log_write "Driver not found: $idx2" log_write "Driver not found: $idx2"
message_write "warning" "Driver not found: $idx2" message_write "warning" "Driver not found: $idx2"
else else
$fnc2 "$idx2" echo "$(date) $fnc2 arg:$idx2" >> "$LOG_OUTPUT_DRV_FILE"
$fnc2 "$idx2" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
} }
@@ -191,7 +196,8 @@ function drv_supply_positive {
message_write "warning" "Driver not found: $idx1" message_write "warning" "Driver not found: $idx1"
return return
else else
$fnc1 "$idx1" echo "$(date) $fnc1 arg:$idx1" >> "$LOG_OUTPUT_DRV_FILE"
$fnc1 "$idx1" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
# Nessun driver definito, esegue l'operazione tramite gpio del raspberry # Nessun driver definito, esegue l'operazione tramite gpio del raspberry
@@ -202,7 +208,8 @@ function drv_supply_positive {
log_write "Driver not found: $idx2" log_write "Driver not found: $idx2"
message_write "warning" "Driver not found: $idx2" message_write "warning" "Driver not found: $idx2"
else else
$fnc2 "$idx2" echo "$(date) $fnc2 arg:$idx2" >> "$LOG_OUTPUT_DRV_FILE"
$fnc2 "$idx2" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
} }
@@ -228,7 +235,8 @@ function drv_supply_negative {
message_write "warning" "Driver not found: $idx1" message_write "warning" "Driver not found: $idx1"
return return
else else
$fnc1 "$idx1" echo "$(date) $fnc1 arg:$idx1" >> "$LOG_OUTPUT_DRV_FILE"
$fnc1 "$idx1" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
# Nessun driver definito, esegue l'operazione tramite gpio del raspberry # Nessun driver definito, esegue l'operazione tramite gpio del raspberry
@@ -239,7 +247,8 @@ function drv_supply_negative {
log_write "Driver not found: $idx2" log_write "Driver not found: $idx2"
message_write "warning" "Driver not found: $idx2" message_write "warning" "Driver not found: $idx2"
else else
$fnc2 "$idx2" echo "$(date) $fnc2 arg:$idx2" >> "$LOG_OUTPUT_DRV_FILE"
$fnc2 "$idx2" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
} }
@@ -262,7 +271,8 @@ function drv_rain_sensor_init {
log_write "Driver not found: $idx" log_write "Driver not found: $idx"
message_write "warning" "Driver not found: $idx" message_write "warning" "Driver not found: $idx"
else else
$fnc "$idx" echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
$fnc "$idx" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
fi fi
} }
@@ -285,6 +295,7 @@ function drv_rain_sensor_get {
log_write "Driver not found: $idx" log_write "Driver not found: $idx"
message_write "warning" "Driver not found: $idx" message_write "warning" "Driver not found: $idx"
else else
echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
vret=`$fnc "$idx"` vret=`$fnc "$idx"`
fi fi