Add sidecar functionality

dumbBlock_test.go

@@ -41,7 +41,7 @@ func (dmb *dumbBlock) run(bc sputnik.BlockCommunicator) {
 	// redirected OnMsg|OnConnect|etc
 	select {
 	case <-dmb.stop:
-		return
+		break
 	}
 
 	return
@@ -57,7 +57,7 @@ func (dmb *dumbBlock) finish(init bool) {
 
 	select {
 	case <-dmb.done: // Wait finish of Run
-		return
+		break
 	}
 	return
 }

msgprocessor.go

@@ -37,7 +37,7 @@ func (pr *msgProcessor) process() {
 	for {
 		msg, ok := pr.q.Get()
 		if !ok {
-			return
+			break
 		}
 		pr.fnc(msg)
 	}

config.go → sidecar/config.go

@@ -1,11 +1,12 @@
-package sputnik
+package sidecar
 
 import (
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/g41797/gonfig"
+	"github.com/g41797/sputnik"
 )
 
 // ConfigFactory returns implementation of sputnik.ConfFactory based on github.com/tkanos/gonfig
@@ -14,7 +15,7 @@ import (
 // - Env. variable for configuration "example" and key "kname" should be set in environment as "EXAMPLE_KNAME"
 // - Value in environment automatically overrides value from the file
 // - Temporary used github.com/g41797/gonfig  (till merge of PR)
-func ConfigFactory(cfPath string) ConfFactory {
+func ConfigFactory(cfPath string) sputnik.ConfFactory {
 	cnf := newConfig(cfPath)
 	return cnf.unmarshal
 }

config_test.go → sidecar/config_test.go

@@ -1,11 +1,11 @@
-package sputnik_test
+package sidecar_test
 
 import (
 	"os"
 	"strconv"
 	"testing"
 
-	"github.com/g41797/sputnik"
+	"github.com/g41797/sputnik/sidecar"
 )
 
 type TestConf struct {
@@ -17,7 +17,7 @@ func TestJSON(t *testing.T) {
 
 	confFolderPath := "./_conf_test/"
 
-	cfact := sputnik.ConfigFactory(confFolderPath)
+	cfact := sidecar.ConfigFactory(confFolderPath)
 
 	expected := defaults()
 
@@ -32,7 +32,7 @@ func TestENV(t *testing.T) {
 
 	confFolderPath := "./_conf_test/"
 
-	cfact := sputnik.ConfigFactory(confFolderPath)
+	cfact := sidecar.ConfigFactory(confFolderPath)
 
 	expected := defaults()
 	expected.SECONDINT = 12345

messageproducer.go → sidecar/messageproducer.go

@@ -1,13 +1,15 @@
-package sputnik
+package sidecar
+
+import "github.com/g41797/sputnik"
 
 // MessageProducer provides possibility for negotiation between sputnik based
 // software and external broker process
 type MessageProducer interface {
 	// Connect to the broker
-	Connect(cf ConfFactory) error
+	Connect(cf sputnik.ConfFactory) error
 
 	// Translate message to format of the broker and send it
-	Produce(msg Msg) error
+	Produce(msg sputnik.Msg) error
 
 	// If connection is alive closes it
 	Disconnect()

runner.go → sidecar/runner.go

@@ -1,4 +1,4 @@
-package sputnik
+package sidecar
 
 import (
 	"encoding/json"
@@ -7,9 +7,11 @@ import (
 	"os"
 	"path/filepath"
 	"time"
+
+	"github.com/g41797/sputnik"
 )
 
-func Start(cntr ServerConnector) {
+func Start(cntr sputnik.ServerConnector) {
 
 	var confFolder string
 	flag.StringVar(&confFolder, "cf", "", "Path of folder with config files")
@@ -35,12 +37,12 @@ const brokerCheckTimeOut = time.Second
 
 type Runner struct {
 	// ShootDown
-	kill ShootDown
+	kill sputnik.ShootDown
 	// Signalling channel
 	done chan struct{}
 }
 
-func StartRunner(confFolder string, cntr ServerConnector) (*Runner, error) {
+func StartRunner(confFolder string, cntr sputnik.ServerConnector) (*Runner, error) {
 	info, err := prepare(confFolder, cntr)
 	if err != nil {
 		return nil, err
@@ -83,12 +85,12 @@ func (rnr *Runner) Wait() {
 }
 
 type runnerInfo struct {
-	cfact     ConfFactory
-	cnt       ServerConnector
-	appBlocks []BlockDescriptor
+	cfact     sputnik.ConfFactory
+	cnt       sputnik.ServerConnector
+	appBlocks []sputnik.BlockDescriptor
 }
 
-func prepare(confFolder string, cntr ServerConnector) (*runnerInfo, error) {
+func prepare(confFolder string, cntr sputnik.ServerConnector) (*runnerInfo, error) {
 	info, err := os.Stat(confFolder)
 	if err != nil {
 		return nil, err
@@ -110,10 +112,10 @@ func prepare(confFolder string, cntr ServerConnector) (*runnerInfo, error) {
 
 func (rnr *Runner) Start(ri *runnerInfo) error {
 
-	sp, err := NewSputnik(
-		WithAppBlocks(ri.appBlocks),
-		WithConfFactory(ri.cfact),
-		WithConnector(ri.cnt, brokerCheckTimeOut),
+	sp, err := sputnik.NewSputnik(
+		sputnik.WithAppBlocks(ri.appBlocks),
+		sputnik.WithConfFactory(ri.cfact),
+		sputnik.WithConnector(ri.cnt, brokerCheckTimeOut),
 	)
 
 	if err != nil {
@@ -128,23 +130,23 @@ func (rnr *Runner) Start(ri *runnerInfo) error {
 	rnr.kill = kill
 	rnr.done = make(chan struct{})
 
-	go func(l Launch, done chan struct{}) {
+	go func(l sputnik.Launch, done chan struct{}) {
 		l()
 		close(done)
 	}(launch, rnr.done)
 
 	return nil
 }
 
-func ReadAppBlocks(confFolder string) ([]BlockDescriptor, error) {
+func ReadAppBlocks(confFolder string) ([]sputnik.BlockDescriptor, error) {
 	fPath := filepath.Join(confFolder, "blocks.json")
 
 	blocksRaw, err := os.ReadFile(fPath)
 	if err != nil {
 		return nil, err
 	}
 
-	var result []BlockDescriptor
+	var result []sputnik.BlockDescriptor
 
 	json.Unmarshal([]byte(blocksRaw), &result)