Merge pull request #1104 from javierbrk/shared-state-async_intial_pub…

…lish

Shared state async intial publish

packages/shared-state-async/README.adoc

@@ -47,3 +47,24 @@ https://openwrt.org/docs/guide-developer/gdb
 VoCore2: Develop for OpenWrt on Qt Creator
 https://vonger.cn/?p=14657
 
+=== Plugin related notes
+Plugins must be registered into shared-state-async by using the config file. UCI infrastructure is preferred
+
+[source,console]
+--------------------------------------------------------------------------------
+mSc="plugin_name"
+
+uci set shared-state.${mSc}=dataType
+uci set shared-state.${mSc}.name='plugin-name'
+uci set shared-state.${mSc}.scope='community'
+uci set shared-state.${mSc}.ttl='1200'
+uci set shared-state.${mSc}.update_interval='120'
+uci commit shared-state
+--------------------------------------------------------------------------------
+
+Publishers must be located at +/usr/share/shared-state/publishers+ 
+All Publishers will be called at least once using shared-state-async-publish-all
+
+Sync is called automatically by shared-state-async according to "update_interval" parameter
+"ttl" stands for "time to live" and will decrease until 0.
+Data contents will be erased if "ttl" reaches 0. 

packages/shared-state-async/files/etc/init.d/shared-state-async

@@ -31,4 +31,7 @@ start_service()
 	procd_set_param stderr 1
 	procd_set_param term_timeout 10
 	procd_close_instance
+
+	#wait 10 secconds in detached mode and call publishres
+	((sleep 10; shared-state-async-publish-all)&) 
 }

packages/shared-state-async/files/etc/uci-defaults/shared-state-publish-all-cron

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+unique_append()
+{
+	grep -qF "$1" "$2" || echo "$1" >> "$2"
+}
+
+unique_append \
+	'*/30 * * * * ((sleep $(($RANDOM % 120)); shared-state-async-publish-all &> /dev/null)&)' \
+	/etc/crontabs/root

packages/shared-state-async/files/usr/bin/shared-state-async-publish-all

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for publisher in /usr/share/shared-state/publishers/* ; do
+    [ -x "$publisher" ] && "$publisher";
+done

packages/shared-state-babel_links_info/files/etc/uci-defaults/shared-state_babel_links_info

@@ -12,6 +12,3 @@ uci set shared-state.babel_links_info.ttl='2400'
 uci set shared-state.babel_links_info.update_interval='30'
 uci commit shared-state
 
-unique_append \
-	'*/30 * * * * ((sleep $(($RANDOM % 120)); shared-state-publish_babel_links_info &> /dev/null)&)' \
-	/etc/crontabs/root

packages/shared-state-babel_links_info/tests/test_shared-state-babel_links_info.lua

@@ -27,7 +27,7 @@ describe('Tests network_nodes #network_nodes', function()
     end)
 
     it('a simple test to get babel info and assert requiered fields are present', function()
-        package.path = package.path .. ";packages/shared-state-babel_links_info/files/usr/bin/?;;"
+        package.path = package.path .. ";packages/shared-state-babel_links_info/files/usr/share/shared-state/publishers/?;;"
         require("shared-state-publish_babel_links_info")
 
         babelinfo = get_babel_links_info()

packages/shared-state-bat_hosts/files/etc/hotplug.d/iface/shared-state-bat_hosts.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-[ "x$ACTION" == "xifup" ] && ((sleep 30; shared-state-publish_bat_hosts; shared-state-async sync bat-hosts)&)
+[ "x$ACTION" == "xifup" ] && ((sleep 30; /usr/share/shared-state/publishers/shared-state-publish_bat_hosts)&)

packages/shared-state-bat_hosts/files/etc/uci-defaults/shared-state-bat_hosts-cron

@@ -12,6 +12,3 @@ uci set shared-state.bat_hosts.ttl='2400'
 uci set shared-state.bat_hosts.update_interval='30'
 uci commit shared-state
 
-unique_append \
-	'*/30 * * * * ((sleep $(($RANDOM % 120)); shared-state-publish_bat_hosts &> /dev/null)&)' \
-	/etc/crontabs/root

packages/shared-state-bat_links_info/files/etc/hotplug.d/iface/shared-state-bat_links.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+[ "x$ACTION" == "xifup" ] && ((sleep 30; /usr/share/shared-state/publishers/shared-state-publish_bat_links)&)

packages/shared-state-bat_links_info/files/etc/uci-defaults/shared-state_bat_links_info_cron

@@ -11,7 +11,3 @@ uci set shared-state.bat_links_info.scope='community'
 uci set shared-state.bat_links_info.ttl='2400'
 uci set shared-state.bat_links_info.update_interval='30'
 uci commit shared-state
-
-unique_append \
-	'*/30 * * * * ((sleep $(($RANDOM % 120)); shared-state-publish_bat_links_info &> /dev/null)&)' \
-	/etc/crontabs/root

packages/shared-state-bat_links_info/tests/test_shared-state-bat_links_info.lua

@@ -189,7 +189,7 @@ describe('Tests bat_links_info #bat_links_info', function ()
         return iwinfo.mocks.wlan1_mesh_mac
     end)
 
-    package.path = package.path .. ";packages/shared-state-bat_links_info/files/usr/bin/?;;"
+    package.path = package.path .. ";packages/shared-state-bat_links_info/files/usr/share/shared-state/publishers/?;;"
     require ("shared-state-publish_bat_links_info")
 
     it('a simple test to get node info and assert requiered fields are present', function()