v1.9.3

Author: aleibovici

.dockerignore

@@ -1,6 +1,5 @@
 .git
 .github
-.travis.yml
 .DS_Store
 .vscode
 .dccache

.github/workflows/docker-image.yml

@@ -0,0 +1,49 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ main, beta ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        id: buildx
+        with:
+          install: true
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+          file: ./Dockerfile.cryptopump
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/cryptopump:latest
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+          file: ./Dockerfile.mysql
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/cryptopump_db:latest
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/go.yml

@@ -2,7 +2,7 @@ name: Go
 
 on:
   push:
-    branches: [ main, beta, features ]
+    branches: [ main, beta ]
 
 jobs:
 

Dockerfile.cryptopump

@@ -1,15 +1,23 @@
 FROM golang:1.16
+
 RUN apt-get update -qq && apt-get install -y -qq \
     && apt-get -qq clean
+
 WORKDIR /go/src/cryptopump
+
 COPY . .
+
 # do not copy configuration files, but rather configuration templates
 COPY config/config_template.yml /go/src/cryptopump/config/config.yml
 COPY config/config_global_template.yml /go/src/cryptopump/config/config_global.yml
+
 # install dependencies
-RUN go get -d  -v ./... 
 RUN go install -v ./...
+
 # forward request and error logs to docker log collector
 RUN ln -sf /dev/stdout cryptopump.log \
     && ln -sf /dev/stderr cryptopump_debug.log
-CMD ["cryptopump"]
+
+RUN go build -o /cryptopump
+
+ENTRYPOINT [ "cryptopump" ]

docker-compose.yml

@@ -31,7 +31,6 @@ services:
       - DB_NAME=cryptopump
     ports:
       - "8080-8090:8080-8090"
-      - "22:22"
     tty: true
     volumes:
       - config_data:/go/src/cryptopump/config # config files

exchange/binance.go

@@ -3,11 +3,11 @@ package exchange
 import (
 	"context"
 	"flag"
-	"os"
 	"time"
 
 	"github.com/aleibovici/cryptopump/functions"
 	"github.com/aleibovici/cryptopump/logger"
+	"github.com/aleibovici/cryptopump/threads"
 	"github.com/aleibovici/cryptopump/types"
 
 	"github.com/adshao/go-binance/v2"
@@ -161,15 +161,6 @@ func binanceGetClient(
 	binance.WebsocketKeepalive = false
 	binance.WebsocketTimeout = time.Second * 30
 
-	/* If TRAVIS flag is set, the testnet API is used */
-	if os.Getenv("TRAVIS") == "true" {
-
-		configData.ConfigGlobal.ApikeyTestNet = functions.MustGetenv("apikeytestnet")
-		configData.ConfigGlobal.SecretkeyTestNet = functions.MustGetenv("secretkeytestnet")
-		return binance.NewClient(configData.ConfigGlobal.ApikeyTestNet, configData.ConfigGlobal.SecretkeyTestNet)
-
-	}
-
 	/* If the -test.v flag is set, the testnet API is used */
 	if flag.Lookup("test.v") != nil {
 
@@ -334,6 +325,9 @@ func binanceGetSymbolFunds(
 
 	}
 
+	/* Cleanly exit ThreadID */
+	threads.Thread{}.Terminate(sessionData, "Balance or Pair not found for symbol "+sessionData.Symbol[0:3])
+
 	return 0, err
 
 }

main.go

@@ -118,6 +118,7 @@ func main() {
 		DiffTotal:               0,
 		Global:                  &types.Global{},
 		Admin:                   false,
+		Port:                    "",
 	}
 
 	marketData := &types.Market{
@@ -146,15 +147,23 @@ func main() {
 		viperData:   viperData,
 	}
 
-	port := functions.GetPort() /* Determine port for HTTP service. */
+	sessionData.Port = functions.GetPort() /* Determine port for HTTP service. */
+
+	logger.LogEntry{ /* Log Entry */
+		Config:   configData,
+		Market:   marketData,
+		Session:  sessionData,
+		Order:    &types.Order{},
+		Message:  "Listening on port " + sessionData.Port,
+		LogLevel: "InfoLevel",
+	}.Do()
 
 	http.HandleFunc("/", myHandler.handler)
 	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
-	fmt.Printf("Listening on port %s \n", port)
 
-	open.Run("http://localhost:" + port) /* Open URI using the OS's default browser */
+	open.Run("http://localhost:" + sessionData.Port) /* Open URI using the OS's default browser */
 
-	http.ListenAndServe(fmt.Sprintf(":%s", port), nil) /* Start HTTP service. */
+	http.ListenAndServe(fmt.Sprintf(":%s", sessionData.Port), nil) /* Start HTTP service. */
 
 }
 
@@ -387,7 +396,7 @@ func execution(
 			Market:   marketData,
 			Session:  sessionData,
 			Order:    &types.Order{},
-			Message:  "Resuming",
+			Message:  "Resuming on port " + sessionData.Port,
 			LogLevel: "InfoLevel",
 		}.Do()
 
@@ -410,7 +419,7 @@ func execution(
 			Market:   marketData,
 			Session:  sessionData,
 			Order:    &types.Order{},
-			Message:  "Initializing",
+			Message:  "Initializing on port " + sessionData.Port,
 			LogLevel: "InfoLevel",
 		}.Do()
 

types/types.go

@@ -109,7 +109,8 @@ type Session struct {
 	QuantityOffsetFlag      bool                     /* This flag is true when the quantity is offset */
 	DiffTotal               float64                  /* This variable holds the difference between the total funds and the total funds in the last session */
 	Global                  *Global
-	Admin                   bool /* This flag is true when the admin page is selected */
+	Admin                   bool   /* This flag is true when the admin page is selected */
+	Port                    string /* This variable holds the port number for the web server */
 }
 
 // Global (Session.Global) struct store semi-persistent values to help offload mySQL queries load