mirror of
https://github.com/postmannen/ctrl.git
synced 2024-12-14 12:37:31 +00:00
fixed removal of tmp nkey file, added docker compose example, and added debug logging for when messages are read from the readfolder
This commit is contained in:
parent
34e0c5d1c6
commit
cef1170233
3 changed files with 30 additions and 5 deletions
19
docker-compose.yaml
Normal file
19
docker-compose.yaml
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
# Example docker compose file
|
||||||
|
# Build image with:
|
||||||
|
# docker build -t ctrl:0.03 .
|
||||||
|
# Or to push to docker hub:
|
||||||
|
# docker buildx build --platform linux/amd64 --tag ctrl:amd64-0.03 --load .
|
||||||
|
# docker tag ctrl:amd64-0.03 postmannen/ctrl:amd64-0.03
|
||||||
|
# docker push postmannen/ctrl:amd64-0.03
|
||||||
|
version: "3"
|
||||||
|
|
||||||
|
services:
|
||||||
|
ctrl:
|
||||||
|
build: .
|
||||||
|
env_file:
|
||||||
|
- tmp/env.file
|
||||||
|
image: ctrl:0.02
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- "2111:2111"
|
||||||
|
- "8090:8090"
|
|
@ -289,6 +289,9 @@ func (s *server) readFolder() {
|
||||||
s.errorKernel.errSend(s.processInitial, Message{}, er, logWarning)
|
s.errorKernel.errSend(s.processInitial, Message{}, er, logWarning)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
er := fmt.Errorf("readFolder: read new message in readfolder and putting it on s.samToSendCh: %#v", sams)
|
||||||
|
s.errorKernel.errSend(s.processInitial, Message{}, er, logDebug)
|
||||||
|
|
||||||
// Send the SAM struct to be picked up by the ring buffer.
|
// Send the SAM struct to be picked up by the ring buffer.
|
||||||
s.samToSendCh <- sams
|
s.samToSendCh <- sams
|
||||||
s.auditLogCh <- sams
|
s.auditLogCh <- sams
|
||||||
|
|
13
server.go
13
server.go
|
@ -123,11 +123,14 @@ func NewServer(configuration *Configuration, version string) (*server, error) {
|
||||||
cancel()
|
cancel()
|
||||||
return nil, fmt.Errorf("error: failed to read temp nkey seed file: %v", err)
|
return nil, fmt.Errorf("error: failed to read temp nkey seed file: %v", err)
|
||||||
}
|
}
|
||||||
err = os.Remove(pth)
|
|
||||||
if err != nil {
|
defer func() {
|
||||||
cancel()
|
err = os.Remove(pth)
|
||||||
return nil, fmt.Errorf("error: failed to remove temp seed file: %v", err)
|
if err != nil {
|
||||||
}
|
cancel()
|
||||||
|
log.Fatalf("error: failed to remove temp seed file: %v\n", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
case configuration.NkeySeedFile != "" && configuration.NkeyFromED25519SSHKeyFile == "":
|
case configuration.NkeySeedFile != "" && configuration.NkeyFromED25519SSHKeyFile == "":
|
||||||
var err error
|
var err error
|
||||||
|
|
Loading…
Reference in a new issue