fix: [CI SKIP] More cleanup. Based on the Go Report Card.

This commit is contained in:
James Wells 2021-05-30 15:37:49 -07:00
parent 0322bc2081
commit e47a8ebc10
Signed by: jwells
GPG key ID: 73196D10B8E65666
3 changed files with 16 additions and 13 deletions

View file

@ -20,6 +20,7 @@ import (
cty "github.com/zclconf/go-cty/cty"
)
// G'Agent version number.
const VERSION = "0.0.1"
var exitCodes = struct {

View file

@ -12,6 +12,7 @@ import (
var fname = flag.String("f", "", "file name")
// TCL puts function.
func CommandPuts(i *picol.Interp, argv []string, pd interface{}) (string, error) {
if len(argv) != 2 {
return "", fmt.Errorf("Wrong number of args for %s %s", argv[0], argv)

View file

@ -9,6 +9,7 @@ import (
zmq "github.com/pebbe/zmq4"
)
// @TODO -- This was documented in the example, and I am unclear what it does
const (
WORKER_READY = "\001" // Signals worker is ready
)
@ -17,23 +18,23 @@ const (
func Main(config gs.GagentConfig) {
log.Printf("[INFO] Starting router\n")
client_sock, _ := zmq.NewSocket(zmq.ROUTER)
defer client_sock.Close()
clientSock, _ := zmq.NewSocket(zmq.ROUTER)
defer clientSock.Close()
worker_sock, _ := zmq.NewSocket(zmq.DEALER)
defer worker_sock.Close()
workerSock, _ := zmq.NewSocket(zmq.DEALER)
defer workerSock.Close()
client_sock.Bind(fmt.Sprintf("tcp://%s:%d", config.ListenAddr, config.ClientPort))
worker_sock.Bind(fmt.Sprintf("tcp://%s:%d", config.ListenAddr, config.WorkerPort))
clientSock.Bind(fmt.Sprintf("tcp://%s:%d", config.ListenAddr, config.ClientPort))
workerSock.Bind(fmt.Sprintf("tcp://%s:%d", config.ListenAddr, config.WorkerPort))
workers := make([]string, 0)
poller1 := zmq.NewPoller()
poller1.Add(worker_sock, zmq.POLLIN)
poller1.Add(workerSock, zmq.POLLIN)
poller2 := zmq.NewPoller()
poller2.Add(worker_sock, zmq.POLLIN)
poller2.Add(client_sock, zmq.POLLIN)
poller2.Add(workerSock, zmq.POLLIN)
poller2.Add(clientSock, zmq.POLLIN)
LOOP:
for {
@ -50,7 +51,7 @@ LOOP:
}
for _, socket := range sockets {
switch s := socket.Socket; s {
case worker_sock: // Handle worker activity on backend
case workerSock: // Handle worker activity on backend
// Use worker identity for load-balancing
msg, err := s.RecvMessage(0)
if err != nil {
@ -63,15 +64,15 @@ LOOP:
// Forward message to client if it's not a READY
if msg[0] != WORKER_READY {
client_sock.SendMessage(msg)
clientSock.SendMessage(msg)
}
case client_sock:
case clientSock:
// Get client request, route to first available worker
msg, err := s.RecvMessage(0)
log.Printf("[DEBUG] Client message received: %s", msg)
if err == nil {
worker_sock.SendMessage(workers[0], "", msg)
workerSock.SendMessage(workers[0], "", msg)
workers = workers[1:]
}
}