From 108e0e3bf5fea6046d99c150e0804aaa05847575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionu=C8=9B-Alex=20Oprea?= Date: Wed, 16 May 2018 17:27:45 +0200 Subject: [PATCH] Update feed [ feed_inteno_packages ] package [ imonitor ] ------------------------------------------------------------------------------- * 297c594 Interval option now supports decimal number * e74f168 Implemented string_regex matching option * 387afe6 Improve monitor tests to be more robust * 28c2870 Change internal handling of match options * 844f293 Rearrange #include locations * e3a5d16 Rename a test config file * d70af8d Updated Dockerfile to build consistent environment * 2108f29 allow OpenSSH login without password and set port map * c66c1fe add sudo when running make test or make test_coverage * 0b4240a change exec call in README.md * 7d6adde change Dockerfile exec label * da47c38 add strace * 3f7f773 implement string_not_match * ff92f92 bump to newest CMocka 1.1.1 * 265b43a configure user sudo * 650549a write 'Development Workflow' chapter * 2cf5f51 test that a process is running after the execute is called * 7c356d6 add a note regarding usage of make format with root user * 807641d add NetBeans IDE project folder to ignore list * 4f30881 format the code using project code style * 8140f7b map host user to a container * 54180ab integrate automatic code style check and correction * 96e49c5 add missing static keyword * d2488f2 use system call insted of ubus for execute * 187d88f Unify whitespaces across files * 425c16a add OpenSSH server into Dockerfile ------------------------------------------------------------------------------- commit 297c5945dcbc22a1504307ea658d7b43eb45d295 Author: Matija Amidzic Date: 2018-03-26 16:37:51 +0200 Interval option now supports decimal number Changed the way interval option is parsed. Now there is a guard against negative and too large values. Some tests needed to be updated to work with this changes. Added parser tests for negative value and decimal value. Signed-off-by: Matija Amidzic Base directory -> / src/monitor.c | 4 +- src/uci_parser.c | 17 ++++-- test/data/uci_file_invalid_negative_interval_value | 8 +++ test/data/uci_file_valid_float_interval | 8 +++ test/monitor.c | 26 ++++----- test/uci_parser.c | 62 ++++++++++++++++++++-- 6 files changed, 103 insertions(+), 22 deletions(-) ------------------------------------------------------------------------------- commit e74f1684bf8d88aff29a2ecd00fa89529cd8a6d0 Author: Matija Amidzic Date: 2018-03-26 14:46:52 +0200 Implemented string_regex matching option imonitor can now use regular expressions (POSIX ERE flavour) to match the pattern to the test output. Corresponding tests and readme updates are also included in this commit. Signed-off-by: Matija Amidzic Base directory -> / README.md | 30 ++-- src/main.c | 1 + src/monitor.c | 25 ++- src/uci_parser.c | 2 +- ..._file_invalid_both_string_match_and_regex_match | 9 ++ ...valid_string_match_string_not_match_regex_match | 10 ++ test/data/uci_file_valid_regex_match | 8 + test/monitor.c | 167 +++++++++++++++++++++ test/uci_parser.c | 61 ++++++++ 9 files changed, 295 insertions(+), 18 deletions(-) ------------------------------------------------------------------------------- commit 387afe6b4ae748a7171027f6c95827753c3edeb8 Author: Matija Amidzic Date: 2018-03-23 12:31:24 +0100 Improve monitor tests to be more robust Signed-off-by: Matija Amidzic Base directory -> / test/monitor.c | 254 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 217 insertions(+), 37 deletions(-) ------------------------------------------------------------------------------- commit 28c28702cca84fbc10cc8171cdd5dc0af53b113e Author: Matija Amidzic Date: 2018-03-23 10:19:31 +0100 Change internal handling of match options Reworked how string_match and string_not_match options are handled internally. Also added beginning of support for regex matching. Signed-off-by: Matija Amidzic Base directory -> / src/monitor.c | 73 +++++++++++++++++++++++-------------------- src/monitor.h | 5 +-- src/uci_parser.c | 93 +++++++++++++++++++++++++++++++++---------------------- test/monitor.c | 27 ++++++++++------ test/uci_parser.c | 8 ++--- 5 files changed, 121 insertions(+), 85 deletions(-) ------------------------------------------------------------------------------- commit 844f2937d19636e978d3dda939fb4a11c774013f Author: Matija Amidzic Date: 2018-03-23 10:16:19 +0100 Rearrange #include locations Signed-off-by: Matija Amidzic Base directory -> / src/control.h | 18 ------------------ src/monitor.c | 1 - src/monitor.h | 17 ++++++++++++++++- src/uci_parser.c | 3 ++- src/uci_parser.h | 2 +- test/uci_parser.c | 1 + 6 files changed, 20 insertions(+), 22 deletions(-) ------------------------------------------------------------------------------- commit e3a5d16ad17c65a02a70e82a08262ca77be6e162 Author: Matija Amidzic Date: 2018-03-23 09:56:45 +0100 Rename a test config file Signed-off-by: Matija Amidzic Base directory -> / .../data/uci_file_invalid_both_string_match_and_string_not_match | 9 +++++++++ test/data/uci_file_valid_both_string_match_and_string_not_match | 9 --------- test/uci_parser.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) ------------------------------------------------------------------------------- commit d70af8d33b81be91f92b67af3567cc5dbf1755ba Author: Matija Amidzic Date: 2018-03-23 09:48:10 +0100 Updated Dockerfile to build consistent environment Now checkouts a specific commit for uci, ubus and rpcd sources Signed-off-by: Matija Amidzic Base directory -> / Dockerfile | 3 +++ 1 file changed, 3 insertions(+) ------------------------------------------------------------------------------- commit 2108f29a50bfdf229ea3226634723e53e8e313ee Author: Hrvoje Varga Date: 2018-03-21 20:26:44 +0100 allow OpenSSH login without password and set port map Signed-off-by: Hrvoje Varga Base directory -> / Dockerfile | 3 ++- README.md | 2 +- entrypoint.sh | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) ------------------------------------------------------------------------------- commit c66c1fe81d8726ad22acad0f2b33e1a634d7f834 Author: Hrvoje Varga Date: 2018-03-20 17:56:25 +0100 add sudo when running make test or make test_coverage Signed-off-by: Hrvoje Varga Base directory -> / README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ------------------------------------------------------------------------------- commit 0b4240a8a00f759d0661766025b4fea8ad19003b Author: Hrvoje Varga Date: 2018-03-20 13:18:37 +0100 change exec call in README.md Signed-off-by: Hrvoje Varga Base directory -> / README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 7d6adde6329ff427b112b8124a6436b9de5a4789 Author: Hrvoje Varga Date: 2018-03-20 10:55:16 +0100 change Dockerfile exec label Signed-off-by: Hrvoje Varga Base directory -> / Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ------------------------------------------------------------------------------- commit da47c385520eb41c1d948e16689d2b14eda80a26 Author: Hrvoje Varga Date: 2018-03-19 14:43:42 +0100 add strace Signed-off-by: Hrvoje Varga Base directory -> / Dockerfile | 1 + 1 file changed, 1 insertion(+) ------------------------------------------------------------------------------- commit 3f7f773f5bb4eb460fa6329842e84824070f7ca8 Author: Hrvoje Varga Date: 2018-03-19 14:25:04 +0100 implement string_not_match Signed-off-by: Hrvoje Varga Base directory -> / src/control.h | 1 + src/monitor.c | 57 ++++++++++++------ src/uci_parser.c | 42 ++++++++++--- src/uci_parser.h | 1 + ...le_valid_both_string_match_and_string_not_match | 9 +++ test/data/uci_file_valid_string_not_match | 8 +++ test/monitor.c | 68 +++++++++++++++++++++- test/uci_parser.c | 46 +++++++++++++++ 8 files changed, 205 insertions(+), 27 deletions(-) ------------------------------------------------------------------------------- commit ff92f92b984240142b2b1ca917f2559eeeac2124 Author: Hrvoje Varga Date: 2018-03-19 10:19:32 +0100 bump to newest CMocka 1.1.1 Signed-off-by: Hrvoje Varga Base directory -> / Dockerfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 265b43a7a5c5efe4ad1d24282736af84695cbc8d Author: Hrvoje Varga Date: 2018-03-19 10:04:38 +0100 configure user sudo Signed-off-by: Hrvoje Varga Base directory -> / Dockerfile | 1 + entrypoint.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 650549a84cc5c0f64dfe3f2b7d2184130be292eb Author: Hrvoje Varga Date: 2018-03-16 14:54:44 +0100 write 'Development Workflow' chapter Signed-off-by: Hrvoje Varga Base directory -> / README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 2cf5f51f2c8cd2071fbe5f5f20482f10b45ac7f9 Author: Hrvoje Varga Date: 2018-03-16 10:01:17 +0100 test that a process is running after the execute is called Signed-off-by: Hrvoje Varga Base directory -> / test/control.c | 70 +++++++++++++++++++++++++++++++- test/data/uci_file_valid_execute_command | 8 ++++ 2 files changed, 77 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 7c356d6ed1429d9260d7a8d88619b86d226dda4d Author: Hrvoje Varga Date: 2018-03-16 08:17:46 +0100 add a note regarding usage of make format with root user Signed-off-by: Hrvoje Varga Base directory -> / README.md | 2 ++ 1 file changed, 2 insertions(+) ------------------------------------------------------------------------------- commit 807641d76f22c1d3cf3d34838bc3de0a1cd3b09f Author: Hrvoje Varga Date: 2018-03-15 15:41:39 +0100 add NetBeans IDE project folder to ignore list Signed-off-by: Hrvoje Varga Base directory -> / .gitignore | 1 + 1 file changed, 1 insertion(+) ------------------------------------------------------------------------------- commit 4f308811022e8368d34f0c011ca255729f86783f Author: Hrvoje Varga Date: 2018-03-15 15:40:50 +0100 format the code using project code style Signed-off-by: Hrvoje Varga Base directory -> / src/debug.h | 83 ++++++++++++------- src/main.c | 4 +- src/monitor.c | 56 +++++++------ src/monitor.h | 4 +- src/uci_parser.c | 22 ++++-- test/control.c | 24 +++--- test/monitor.c | 168 +++++++++++++++++++++++---------------- test/uci_parser.c | 233 +++++++++++++++++++++++++++++------------------------- 8 files changed, 345 insertions(+), 249 deletions(-) ------------------------------------------------------------------------------- commit 8140f7b753f8e7cc6d495557d19d3ae904135034 Author: Hrvoje Varga Date: 2018-03-15 15:18:46 +0100 map host user to a container Signed-off-by: Hrvoje Varga Base directory -> / Dockerfile | 9 ++++++--- README.md | 2 +- entrypoint.sh | 11 +++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) ------------------------------------------------------------------------------- commit 54180ab6fbd84d1fb8ceb3846a9e4b8b5237d46b Author: Hrvoje Varga Date: 2018-03-15 12:02:22 +0100 integrate automatic code style check and correction Signed-off-by: Hrvoje Varga Base directory -> / .clang-format | 89 +++++++++++++++++++++++++++++++++++++ CMakeLists.txt | 4 ++ Dockerfile | 1 + README.md | 31 +++++++++++++ cmake/modules/FindClangFormat.cmake | 33 ++++++++++++++ cmake/modules/clang-format.cmake | 37 +++++++++++++++ 6 files changed, 195 insertions(+) ------------------------------------------------------------------------------- commit 96e49c55bae19c588c601877b87049e5a09e44cd Author: Matija Amidzic Date: 2018-03-13 09:18:54 +0100 add missing static keyword Signed-off-by: Matija Amidzic Base directory -> / src/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ------------------------------------------------------------------------------- commit d2488f2d5ebb85b5492895d28b771a61102a4f7e Author: Matija Amidzic Date: 2018-03-13 09:18:23 +0100 use system call insted of ubus for execute Signed-off-by: Matija Amidzic Base directory -> / src/monitor.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 187d88f345258672a1faf54a95415cfb2bca28e9 Author: Matija Amidzic Date: 2018-03-09 16:26:01 +0100 Unify whitespaces across files Signed-off-by: Matija Amidzic Base directory -> / src/control.c | 26 ++-- src/control.h | 20 ++-- src/debug.h | 40 +++---- src/main.c | 62 +++++----- src/monitor.c | 354 +++++++++++++++++++++++++++---------------------------- src/monitor.h | 4 +- src/uci_parser.c | 6 +- src/uci_parser.h | 6 +- 8 files changed, 259 insertions(+), 259 deletions(-) ------------------------------------------------------------------------------- commit 425c16a82bd713dd97d9bac76b65ee5f06279dbb Author: Hrvoje Varga Date: 2018-03-08 13:29:40 +0100 add OpenSSH server into Dockerfile Signed-off-by: Hrvoje Varga Base directory -> / Dockerfile | 10 ++++++++++ supervisord.conf | 3 +++ 2 files changed, 13 insertions(+) ------------------------------------------------------------------------------- --- imonitor/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imonitor/Makefile b/imonitor/Makefile index eda2fe51d..04e60522d 100644 --- a/imonitor/Makefile +++ b/imonitor/Makefile @@ -12,7 +12,7 @@ PKG_INSTALL:=1 PKG_SOURCE_PROTO=git PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git -PKG_SOURCE_VERSION:=defec6849fb987619fc7fd9295895f4f0b9db5a9 +PKG_SOURCE_VERSION:=297c5945dcbc22a1504307ea658d7b43eb45d295 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION} PKG_MAINTAINER:=Sartura Support for Inteno