From 619e77dfec5589097c4ba65f6121c6e63fe07789 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Fri, 23 Feb 2018 00:14:39 +0100
Subject: [PATCH] [feat] use $SNAP if defined for the socket path
- Resolves: #16
---
bitmask/main.go | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/bitmask/main.go b/bitmask/main.go
index 185c3a03..16321755 100644
--- a/bitmask/main.go
+++ b/bitmask/main.go
@@ -18,7 +18,9 @@ package bitmask
import (
"encoding/json"
"errors"
+ "fmt"
"log"
+ "os"
"time"
"github.com/pebbe/zmq4"
@@ -26,7 +28,7 @@ import (
const (
// On win should be: tcp://127.0.0.1:5001
- coreEndpoint = "ipc:///tmp/bitmask.core.sock"
+ coreEndpoint = "ipc://%s/bitmask.core.sock"
timeout = time.Second * 40
)
@@ -100,6 +102,10 @@ func initCore() (*zmq4.Socket, error) {
return nil, err
}
- err = socket.Connect(coreEndpoint)
+ endpointPwd := "/tmp"
+ if os.Getenv("SNAP") != "" {
+ endpointPwd = os.Getenv("SNAP")
+ }
+ err = socket.Connect(fmt.Sprintf(coreEndpoint, endpointPwd))
return socket, err
}
--
GitLab