feat: changed default storage backend from memory to boltdb. Removed storage type configuration from config file and moved to the app argument.

Author: exelban

.dockerignore

@@ -7,4 +7,5 @@ mock_test.go
 .run
 example.yaml
 release
-release.sh
+release.sh
+data

.gitignore

@@ -4,4 +4,5 @@ config.yaml
 mock_test.go
 *.db
 .run
-release
+release
+data

README.md

@@ -1,5 +1,7 @@
 # JAM
 
+<a href="https://github.com/exelban/JAM"><p align="center"><img src="https://github.com/exelban/JAM/raw/master/templates/static/icon.png" width="120"></p></a>
+
 [![JAM](https://serhiy.s3.eu-central-1.amazonaws.com/Github_repo/JAM/cover.png)](https://github.com/exelban/JAM)
 
 Just Another Monitoring
@@ -28,7 +30,7 @@ Also you can build it from the source code or use the precompiled binaries. But
 
 ### Docker
 ```bash
-docker run -d -v ./jam.yaml:/app/config.yaml exelban/jam:latest
+docker run -d -v ./jam.yaml:/app/config.yaml -v ./data/:/app/data exelban/jam:latest
 ```
 
 ### Docker Compose
@@ -40,6 +42,7 @@ services:
     restart: unless-stopped
     volumes:
       - ./jam.yaml:/app/config.yaml
+      - ./data:/app/data
     logging:
       driver: "json-file"
       options:

main.go

@@ -19,8 +19,11 @@ import (
 
 type arguments struct {
 	ConfigPath string `long:"config-path" env:"CONFIG_PATH" default:"./config.yaml" description:"path to the configuration file"`
-	Port       int    `long:"port" env:"PORT" default:"8822" description:"service rest port"`
-	Debug      bool   `long:"debug" env:"DEBUG" description:"debug mode"`
+
+	StorageType string `long:"storage-type" env:"STORAGE_TYPE" default:"bolt" description:"storage type"`
+
+	Port  int  `long:"port" env:"PORT" default:"8822" description:"service rest port"`
+	Debug bool `long:"debug" env:"DEBUG" description:"debug mode"`
 }
 
 type app struct {
@@ -82,7 +85,7 @@ func create(ctx context.Context, args arguments) (*app, error) {
 		return nil, fmt.Errorf("new config: %w", err)
 	}
 
-	storage, err := store.New(ctx, cfg)
+	storage, err := store.New(ctx, args.StorageType, cfg)
 	if err != nil {
 		return nil, fmt.Errorf("new store: %w", err)
 	}

release.sh

@@ -2,7 +2,31 @@
 
 set -eu
 
-version="v0.0.0"
+version="v0.0.1"
+latestOnly=false
+dockerOnly=false
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -v|--version)
+      version="$2"
+      shift
+      shift
+      ;;
+    -l|--latest)
+      latestOnly=true
+      shift
+      ;;
+    -d|--docker)
+      dockerOnly=true
+      shift
+      ;;
+    -*|--*)
+      echo "Unknown option $1"
+      exit 1
+      ;;
+  esac
+done
 
 build_darwin() {
   GOOS=darwin GOARCH=amd64 go build -ldflags "-X main.version=$version" -o bin/jam && tar -czf release/jam_"$version"_darwin_x86_64.tar.gz -C bin jam && rm bin/jam
@@ -18,30 +42,43 @@ build_windows() {
 }
 
 build_docker_hub() {
-  docker buildx build --push --platform=linux/amd64,linux/arm64 --tag=exelban/jam:"$version" .
+  if [ "$latestOnly" = false ]; then
+    docker buildx build --push --platform=linux/amd64,linux/arm64 --tag=exelban/jam:"$version" .
+  fi
   docker buildx build --push --platform=linux/amd64,linux/arm64 --tag=exelban/jam:latest .
 }
 build_github_registry() {
-  docker buildx build --push --platform=linux/amd64,linux/arm64 --tag=ghcr.io/exelban/jam:"$version" .
+  if [ "$latestOnly" = false ]; then
+    docker buildx build --push --platform=linux/amd64,linux/arm64 --tag=ghcr.io/exelban/jam:"$version" .
+  fi
   docker buildx build --push --platform=linux/amd64,linux/arm64 --tag=ghcr.io/exelban/jam:latest .
 }
 
-printf "\033[32;1m%s\033[0m\n" "Building docker image with version ${version}..."
+if [ "$latestOnly" = true ]; then
+  printf "\033[32;1m%s\033[0m\n" "Building latest version only..."
+else
+  printf "\033[32;1m%s\033[0m\n" "Building version ${version}..."
+fi
+
 build_docker_hub
 build_github_registry
 
-printf "\033[32;1m%s\033[0m\n" "Building precompiled binaries with version ${version}..."
+if [ "$dockerOnly" = false ]; then
+  printf "\033[32;1m%s\033[0m\n" "Building precompiled binaries with version ${version}..."
+
+  rm -rf "bin" && rm -rf "release"
+  mkdir -p "release"
 
-rm -rf "bin" && rm -rf "release"
-mkdir -p "release"
+  echo "Building darwin..."
+  build_darwin
+  echo "Building linux..."
+  build_linux
+  echo "Building windows..."
+  build_windows
+  rm -rf "bin"
 
-echo "Building darwin..."
-build_darwin
-echo "Building linux..."
-build_linux
-echo "Building windows..."
-build_windows
-rm -rf "bin"
+  printf "\033[32;1m%s\033[0m\n" "JAM ${version} was successfully build."
+  open release
+fi
 
-printf "\033[32;1m%s\033[0m\n" "JAM ${version} was successfully build."
-open release
+exit 0

store/store.go

@@ -6,6 +6,7 @@ import (
 	"github.com/exelban/JAM/types"
 	"log"
 	"math/rand/v2"
+	"os"
 	"time"
 )
 
@@ -18,25 +19,28 @@ type Interface interface {
 	Close() error
 }
 
-func New(ctx context.Context, cfg *types.Cfg) (Interface, error) {
+func New(ctx context.Context, typ string, cfg *types.Cfg) (Interface, error) {
 	var store Interface
 
-	if cfg != nil && cfg.Storage != nil {
-		path := "./jam.db"
-		if cfg.Storage.Path != nil {
-			path = fmt.Sprintf("%s/jam.db", *cfg.Storage.Path)
+	dbPath := "./data"
+	if _, err := os.Stat(dbPath); os.IsNotExist(err) {
+		if err := os.Mkdir(dbPath, 0755); err != nil {
+			return nil, fmt.Errorf("failed to create data directory: %w", err)
 		}
+	}
+	dbFilePath := fmt.Sprintf("%s/%s", dbPath, "jam.db")
 
-		switch cfg.Storage.Type {
-		case "bolt":
-			s, err := NewBolt(ctx, path)
-			if err != nil {
-				return nil, err
-			}
-			store = s
-		}
-	} else {
+	switch typ {
+	case "memory":
 		store = NewMemory(ctx)
+		log.Printf("[INFO] using memory storage")
+	default:
+		s, err := NewBolt(ctx, dbFilePath)
+		if err != nil {
+			return nil, err
+		}
+		store = s
+		log.Printf("[INFO] using bolt storage")
 	}
 
 	if err := Aggregate(ctx, store); err != nil {

types/config.go

@@ -31,28 +31,22 @@ type Alerts struct {
 	ShutdownMessage       bool  `json:"shutdownMessage" yaml:"shutdownMessage"`
 }
 
-type Storage struct {
-	Type string  `json:"type" yaml:"type"`
-	Path *string `json:"path,omitempty" yaml:"path,omitempty"`
-}
-
 type Cfg struct {
 	MaxConn int `json:"maxConn" yaml:"maxConn,omitempty"`
 
 	Interval     time.Duration  `json:"interval,omitempty" yaml:"interval,omitempty"`
 	Timeout      time.Duration  `json:"timeout,omitempty" yaml:"timeout,omitempty"`
 	InitialDelay *time.Duration `json:"initialDelay,omitempty" yaml:"initialDelay,omitempty"`
-	
+
 	SuccessThreshold int `json:"successThreshold" yaml:"successThreshold,omitempty"`
 	FailureThreshold int `json:"failureThreshold" yaml:"failureThreshold,omitempty"`
 
 	Conditions *Success          `json:"success" yaml:"success,omitempty"`
 	Headers    map[string]string `json:"headers" yaml:"headers,omitempty"`
 
-	Alerts    Alerts   `json:"alerts" yaml:"alerts,omitempty"`
-	Storage   *Storage `json:"storage" yaml:"storage,omitempty"`
-	FileHosts []*Host  `json:"hosts" yaml:"hosts"`
-	Hosts     []*Host  `json:"-" yaml:"-"`
+	Alerts    Alerts  `json:"alerts" yaml:"alerts,omitempty"`
+	FileHosts []*Host `json:"hosts" yaml:"hosts"`
+	Hosts     []*Host `json:"-" yaml:"-"`
 
 	path        string    `yaml:"-"`
 	initialized bool      `yaml:"-"`