From aaa5ecb96b299ba7893ea2842108aa5121e3fc69 Mon Sep 17 00:00:00 2001 From: David Newhall Date: Thu, 15 Apr 2021 13:31:16 -0700 Subject: [PATCH] Fix packagecloud token,godot test, and struct member typo (#55) --- .travis.yml | 8 ++++---- pkg/snapshot/raid.go | 2 +- pkg/snapshot/snapshot.go | 2 +- settings.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb7624117..048a8f4d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ deploy: repository: unstable username: golift token: - secure: KlMzZdcu46vS5emuS+uAYjwCstbE7rgXbfOyQDw70Qp2MuXDI4aPqt//TcIwcJZN0rjaqLX6hf5P7L0qV+ro676Br5gNm0YZWNN3W165QGTH5LwBEt6cFxOD/hKVKSE7wx7XXd++/Di2Gy1f7Gi0EIpit0rBpDy9u9GHwIkgU57k/ET5kcIAfsc4EHnF2oQEPjk0qunrdmkM29unbKExOa7M5vcJK1hUggLPRszJR6bIaPsT1wJfaw/+oS59y4D8f/LvPjDD6oirEdwEGLqC6slZ2GIWLAGB747UIeXcRTUym4xpUtcr4M/kQ9ZWR98MifBCkcnUgRnXiwPxhWw5QKUEAc41fQY/HIyZyqokdY7z3mALcPdfGn9KoBZw1JOgxKMPCO9jU+sf3ZyC0G0Ue6oS3BPNN0FKAMAF7aWzpFl01ou8a+q7vJq/OBrTOLYrcWW+yWGHtiS95dTJLMFaqZ1jaHrwk6jz5bRvcSHuCXhoXQZsMoOLF3gZWt6Mv6GGqSxPShDVWXZ0n8OSZOtp2W1e1QPG7hRnat+Ga5aDZrWtqvcf3LmN0hMijXk2EStSShBNjpcCezMfn9i4m83B82aD6ZB/0J+rBLs8qVqtEc2LGavPPKu5AlsxD3ffvzQ3342RBrFEZDuVV+GMSGt51v02KcT3UMU70sgT+VP1BTw= + secure: PuwkeI7VlBBEpg9b6KsQy4lDEt10dQuDsZ1qVQBEllqUmpfRbn2EGk8b7nTiRTjfCVT9u1FX4I43MN/IBdgJPg9fI3YQcg5/lbEUrqDLtgo/MsP8pvMnXuhU+JuROdOHJP7/mVJrOOjDJBykTkHgtHhUcd7DcgNL5wytVdxU9szbeSns1MDK6ZPN2zxGYj9H7hmGGPWXSyNFwl87fL9629KEXUh7Ad85/G/EACdv1USz3ZHjOVt7KaUuaK/tnlyygH1WH5ynV5CRuVgcIivGPjsLqbPYGv1OUbg2bq6JcLBgXivmiN+CI6C0LjlZEgYxaEw0ynyCbBTGkRRWSez5LiMsGHfPQynrw7MA6ZCkzfdVHCPT4HSdTCTc6g4kLvf7q2HRVeED07e8RFaNWrxJyOCE05L5PhKHpTilkJjrFVV19hluM95L1xnNEGWRpkJxjrFqwf7l2Y425+pTYwa2wrLdtULkGyLA2Wf7EHqGY2f9LZ3g32In1/do34MCDO/STUBpwIR+PqvATmqbVM8/otq1wmJD5yGmb0U9dp1CPZ3jdKjzlVJ8x7FLVwXhIKZJIh7RdOm7zsfmWvRvQkx0MyFtA4eoekYig+AmJEA+fCCqBQgdB1FHKRoElDUCRw3nyhhYamt6rDdqPxVPVHi87iRdg+OcUEtPNFrUxZDaJHU= dist: ubuntu/focal local-dir: release package_glob: "*.deb" @@ -89,7 +89,7 @@ deploy: repository: unstable username: golift token: - secure: KlMzZdcu46vS5emuS+uAYjwCstbE7rgXbfOyQDw70Qp2MuXDI4aPqt//TcIwcJZN0rjaqLX6hf5P7L0qV+ro676Br5gNm0YZWNN3W165QGTH5LwBEt6cFxOD/hKVKSE7wx7XXd++/Di2Gy1f7Gi0EIpit0rBpDy9u9GHwIkgU57k/ET5kcIAfsc4EHnF2oQEPjk0qunrdmkM29unbKExOa7M5vcJK1hUggLPRszJR6bIaPsT1wJfaw/+oS59y4D8f/LvPjDD6oirEdwEGLqC6slZ2GIWLAGB747UIeXcRTUym4xpUtcr4M/kQ9ZWR98MifBCkcnUgRnXiwPxhWw5QKUEAc41fQY/HIyZyqokdY7z3mALcPdfGn9KoBZw1JOgxKMPCO9jU+sf3ZyC0G0Ue6oS3BPNN0FKAMAF7aWzpFl01ou8a+q7vJq/OBrTOLYrcWW+yWGHtiS95dTJLMFaqZ1jaHrwk6jz5bRvcSHuCXhoXQZsMoOLF3gZWt6Mv6GGqSxPShDVWXZ0n8OSZOtp2W1e1QPG7hRnat+Ga5aDZrWtqvcf3LmN0hMijXk2EStSShBNjpcCezMfn9i4m83B82aD6ZB/0J+rBLs8qVqtEc2LGavPPKu5AlsxD3ffvzQ3342RBrFEZDuVV+GMSGt51v02KcT3UMU70sgT+VP1BTw= + secure: PuwkeI7VlBBEpg9b6KsQy4lDEt10dQuDsZ1qVQBEllqUmpfRbn2EGk8b7nTiRTjfCVT9u1FX4I43MN/IBdgJPg9fI3YQcg5/lbEUrqDLtgo/MsP8pvMnXuhU+JuROdOHJP7/mVJrOOjDJBykTkHgtHhUcd7DcgNL5wytVdxU9szbeSns1MDK6ZPN2zxGYj9H7hmGGPWXSyNFwl87fL9629KEXUh7Ad85/G/EACdv1USz3ZHjOVt7KaUuaK/tnlyygH1WH5ynV5CRuVgcIivGPjsLqbPYGv1OUbg2bq6JcLBgXivmiN+CI6C0LjlZEgYxaEw0ynyCbBTGkRRWSez5LiMsGHfPQynrw7MA6ZCkzfdVHCPT4HSdTCTc6g4kLvf7q2HRVeED07e8RFaNWrxJyOCE05L5PhKHpTilkJjrFVV19hluM95L1xnNEGWRpkJxjrFqwf7l2Y425+pTYwa2wrLdtULkGyLA2Wf7EHqGY2f9LZ3g32In1/do34MCDO/STUBpwIR+PqvATmqbVM8/otq1wmJD5yGmb0U9dp1CPZ3jdKjzlVJ8x7FLVwXhIKZJIh7RdOm7zsfmWvRvQkx0MyFtA4eoekYig+AmJEA+fCCqBQgdB1FHKRoElDUCRw3nyhhYamt6rDdqPxVPVHi87iRdg+OcUEtPNFrUxZDaJHU= dist: el/6 local-dir: release package_glob: "*.rpm" @@ -103,7 +103,7 @@ deploy: repository: pkgs username: golift token: - secure: KlMzZdcu46vS5emuS+uAYjwCstbE7rgXbfOyQDw70Qp2MuXDI4aPqt//TcIwcJZN0rjaqLX6hf5P7L0qV+ro676Br5gNm0YZWNN3W165QGTH5LwBEt6cFxOD/hKVKSE7wx7XXd++/Di2Gy1f7Gi0EIpit0rBpDy9u9GHwIkgU57k/ET5kcIAfsc4EHnF2oQEPjk0qunrdmkM29unbKExOa7M5vcJK1hUggLPRszJR6bIaPsT1wJfaw/+oS59y4D8f/LvPjDD6oirEdwEGLqC6slZ2GIWLAGB747UIeXcRTUym4xpUtcr4M/kQ9ZWR98MifBCkcnUgRnXiwPxhWw5QKUEAc41fQY/HIyZyqokdY7z3mALcPdfGn9KoBZw1JOgxKMPCO9jU+sf3ZyC0G0Ue6oS3BPNN0FKAMAF7aWzpFl01ou8a+q7vJq/OBrTOLYrcWW+yWGHtiS95dTJLMFaqZ1jaHrwk6jz5bRvcSHuCXhoXQZsMoOLF3gZWt6Mv6GGqSxPShDVWXZ0n8OSZOtp2W1e1QPG7hRnat+Ga5aDZrWtqvcf3LmN0hMijXk2EStSShBNjpcCezMfn9i4m83B82aD6ZB/0J+rBLs8qVqtEc2LGavPPKu5AlsxD3ffvzQ3342RBrFEZDuVV+GMSGt51v02KcT3UMU70sgT+VP1BTw= + secure: PuwkeI7VlBBEpg9b6KsQy4lDEt10dQuDsZ1qVQBEllqUmpfRbn2EGk8b7nTiRTjfCVT9u1FX4I43MN/IBdgJPg9fI3YQcg5/lbEUrqDLtgo/MsP8pvMnXuhU+JuROdOHJP7/mVJrOOjDJBykTkHgtHhUcd7DcgNL5wytVdxU9szbeSns1MDK6ZPN2zxGYj9H7hmGGPWXSyNFwl87fL9629KEXUh7Ad85/G/EACdv1USz3ZHjOVt7KaUuaK/tnlyygH1WH5ynV5CRuVgcIivGPjsLqbPYGv1OUbg2bq6JcLBgXivmiN+CI6C0LjlZEgYxaEw0ynyCbBTGkRRWSez5LiMsGHfPQynrw7MA6ZCkzfdVHCPT4HSdTCTc6g4kLvf7q2HRVeED07e8RFaNWrxJyOCE05L5PhKHpTilkJjrFVV19hluM95L1xnNEGWRpkJxjrFqwf7l2Y425+pTYwa2wrLdtULkGyLA2Wf7EHqGY2f9LZ3g32In1/do34MCDO/STUBpwIR+PqvATmqbVM8/otq1wmJD5yGmb0U9dp1CPZ3jdKjzlVJ8x7FLVwXhIKZJIh7RdOm7zsfmWvRvQkx0MyFtA4eoekYig+AmJEA+fCCqBQgdB1FHKRoElDUCRw3nyhhYamt6rDdqPxVPVHi87iRdg+OcUEtPNFrUxZDaJHU= dist: ubuntu/focal local-dir: release package_glob: "*.deb" @@ -116,7 +116,7 @@ deploy: repository: pkgs username: golift token: - secure: KlMzZdcu46vS5emuS+uAYjwCstbE7rgXbfOyQDw70Qp2MuXDI4aPqt//TcIwcJZN0rjaqLX6hf5P7L0qV+ro676Br5gNm0YZWNN3W165QGTH5LwBEt6cFxOD/hKVKSE7wx7XXd++/Di2Gy1f7Gi0EIpit0rBpDy9u9GHwIkgU57k/ET5kcIAfsc4EHnF2oQEPjk0qunrdmkM29unbKExOa7M5vcJK1hUggLPRszJR6bIaPsT1wJfaw/+oS59y4D8f/LvPjDD6oirEdwEGLqC6slZ2GIWLAGB747UIeXcRTUym4xpUtcr4M/kQ9ZWR98MifBCkcnUgRnXiwPxhWw5QKUEAc41fQY/HIyZyqokdY7z3mALcPdfGn9KoBZw1JOgxKMPCO9jU+sf3ZyC0G0Ue6oS3BPNN0FKAMAF7aWzpFl01ou8a+q7vJq/OBrTOLYrcWW+yWGHtiS95dTJLMFaqZ1jaHrwk6jz5bRvcSHuCXhoXQZsMoOLF3gZWt6Mv6GGqSxPShDVWXZ0n8OSZOtp2W1e1QPG7hRnat+Ga5aDZrWtqvcf3LmN0hMijXk2EStSShBNjpcCezMfn9i4m83B82aD6ZB/0J+rBLs8qVqtEc2LGavPPKu5AlsxD3ffvzQ3342RBrFEZDuVV+GMSGt51v02KcT3UMU70sgT+VP1BTw= + secure: PuwkeI7VlBBEpg9b6KsQy4lDEt10dQuDsZ1qVQBEllqUmpfRbn2EGk8b7nTiRTjfCVT9u1FX4I43MN/IBdgJPg9fI3YQcg5/lbEUrqDLtgo/MsP8pvMnXuhU+JuROdOHJP7/mVJrOOjDJBykTkHgtHhUcd7DcgNL5wytVdxU9szbeSns1MDK6ZPN2zxGYj9H7hmGGPWXSyNFwl87fL9629KEXUh7Ad85/G/EACdv1USz3ZHjOVt7KaUuaK/tnlyygH1WH5ynV5CRuVgcIivGPjsLqbPYGv1OUbg2bq6JcLBgXivmiN+CI6C0LjlZEgYxaEw0ynyCbBTGkRRWSez5LiMsGHfPQynrw7MA6ZCkzfdVHCPT4HSdTCTc6g4kLvf7q2HRVeED07e8RFaNWrxJyOCE05L5PhKHpTilkJjrFVV19hluM95L1xnNEGWRpkJxjrFqwf7l2Y425+pTYwa2wrLdtULkGyLA2Wf7EHqGY2f9LZ3g32In1/do34MCDO/STUBpwIR+PqvATmqbVM8/otq1wmJD5yGmb0U9dp1CPZ3jdKjzlVJ8x7FLVwXhIKZJIh7RdOm7zsfmWvRvQkx0MyFtA4eoekYig+AmJEA+fCCqBQgdB1FHKRoElDUCRw3nyhhYamt6rDdqPxVPVHi87iRdg+OcUEtPNFrUxZDaJHU= dist: el/6 local-dir: release package_glob: "*.rpm" diff --git a/pkg/snapshot/raid.go b/pkg/snapshot/raid.go index 16f115afc..f8d0732a3 100644 --- a/pkg/snapshot/raid.go +++ b/pkg/snapshot/raid.go @@ -26,7 +26,7 @@ Personalities : [raid1] [linear] [multipath] [raid0] [raid6] [raid5] [raid4] [ra md1 : active raid1 sdd2[3] sdb2[1] sdc2[2] sda2[0] 536738816 blocks super 1.2 [4/4] [UUUU] bitmap: 3/4 pages [12KB], 65536KB chunk -unused devices: +unused devices: . */ func (s *Snapshot) getRaidMDstat() { b, _ := ioutil.ReadFile("/proc/mdstat") diff --git a/pkg/snapshot/snapshot.go b/pkg/snapshot/snapshot.go index 16b395460..a1d19e106 100644 --- a/pkg/snapshot/snapshot.go +++ b/pkg/snapshot/snapshot.go @@ -24,7 +24,7 @@ const ( // Config determines which checks to run, etc. type Config struct { - Timeout cnfg.Duration `toml:"timeout" xml:"interval"` // total run time allowed. + Timeout cnfg.Duration `toml:"timeout" xml:"timeout"` // total run time allowed. Interval cnfg.Duration `toml:"interval" xml:"interval"` // how often to send snaps (cron). ZFSPools []string `toml:"zfs_pools" xml:"zfs_pool"` // zfs pools to monitor. UseSudo bool `toml:"use_sudo" xml:"use_sudo"` // use sudo for smartctl commands. diff --git a/settings.sh b/settings.sh index 08c28f51e..2e76f2868 100644 --- a/settings.sh +++ b/settings.sh @@ -14,7 +14,7 @@ REPO="Notifiarr/notifiarr" HBREPO="golift/homebrew-mugs" MAINT="David Newhall II " DESC="Unified Client for Notifiarr.com" -GOLANGCI_LINT_ARGS="--enable-all -D exhaustivestruct,nlreturn,forbidigo,cyclop,godot" +GOLANGCI_LINT_ARGS="--enable-all -D exhaustivestruct,nlreturn,forbidigo,cyclop,interfacer,maligned,scopelint" # Example must exist at examples/$CONFIG_FILE.example CONFIG_FILE="notifiarr.conf" LICENSE="MIT"