From 9ec3d8a8761ce3058ead6d189c499ef3a5f8973e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Aug 2015 12:09:06 -0600 Subject: clean up --- sd-daemon/listen_fds.go | 51 ---------------------------------------------- sd-daemon/logger/logger.go | 20 ------------------ sd_daemon/listen_fds.go | 51 ++++++++++++++++++++++++++++++++++++++++++++++ sd_daemon/logger/logger.go | 23 +++++++++++++++++++++ 4 files changed, 74 insertions(+), 71 deletions(-) delete mode 100644 sd-daemon/listen_fds.go delete mode 100644 sd-daemon/logger/logger.go create mode 100644 sd_daemon/listen_fds.go create mode 100644 sd_daemon/logger/logger.go diff --git a/sd-daemon/listen_fds.go b/sd-daemon/listen_fds.go deleted file mode 100644 index c90d373..0000000 --- a/sd-daemon/listen_fds.go +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2015 CoreOS, Inc. -// Copyright 2015 Luke Shumaker -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package activation implements primitives for systemd socket activation. -package listen - -import ( - "os" - "strconv" - "syscall" -) - -//#include -import "C" - -func ListenFds(unsetEnv bool) []*os.File { - if unsetEnv { - defer os.Unsetenv("LISTEN_PID") - defer os.Unsetenv("LISTEN_FDS") - } - - pid, err := strconv.Atoi(os.Getenv("LISTEN_PID")) - if err != nil || pid != os.Getpid() { - return nil - } - - nfds, err := strconv.Atoi(os.Getenv("LISTEN_FDS")) - if err != nil || nfds == 0 { - return nil - } - - files := make([]*os.File, 0, nfds) - for fd := C.SD_LISTEN_FDS_START; fd < C.SD_LISTEN_FDS_START+nfds; fd++ { - syscall.CloseOnExec(fd) - files = append(files, os.NewFile(uintptr(fd), "LISTEN_FD_"+strconv.Itoa(fd))) - } - - return files -} diff --git a/sd-daemon/logger/logger.go b/sd-daemon/logger/logger.go deleted file mode 100644 index cfabe9f..0000000 --- a/sd-daemon/logger/logger.go +++ /dev/null @@ -1,20 +0,0 @@ -package logger - -import ("fmt"; "os") - -//#include -import "C" - -func log(level string, format string, a ...interface{}) { - f := level + format + "\n"; - fmt.Fprintf(os.Stderr, f, a); -} - -/* system is unusable */ func Emerg( format string, a ...interface{}) { log(C.SD_EMERG , format, a); } -/* action must be taken immediately */ func Alert( format string, a ...interface{}) { log(C.SD_ALERT , format, a); } -/* critical conditions */ func Crit( format string, a ...interface{}) { log(C.SD_CRIT , format, a); } -/* error conditions */ func Err( format string, a ...interface{}) { log(C.SD_ERR , format, a); } -/* warning conditions */ func Warning(format string, a ...interface{}) { log(C.SD_WARNING, format, a); } -/* normal but significant condition */ func Notice( format string, a ...interface{}) { log(C.SD_NOTICE , format, a); } -/* informational */ func Info( format string, a ...interface{}) { log(C.SD_INFO , format, a); } -/* debug-level messages */ func Debug( format string, a ...interface{}) { log(C.SD_DEBUG , format, a); } diff --git a/sd_daemon/listen_fds.go b/sd_daemon/listen_fds.go new file mode 100644 index 0000000..45ef699 --- /dev/null +++ b/sd_daemon/listen_fds.go @@ -0,0 +1,51 @@ +// Copyright 2015 CoreOS, Inc. +// Copyright 2015 Luke Shumaker +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package activation implements primitives for systemd socket activation. +package sd_daemon + +import ( + "os" + "strconv" + "syscall" +) + +//#include +import "C" + +func ListenFds(unsetEnv bool) []*os.File { + if unsetEnv { + defer os.Unsetenv("LISTEN_PID") + defer os.Unsetenv("LISTEN_FDS") + } + + pid, err := strconv.Atoi(os.Getenv("LISTEN_PID")) + if err != nil || pid != os.Getpid() { + return nil + } + + nfds, err := strconv.Atoi(os.Getenv("LISTEN_FDS")) + if err != nil || nfds == 0 { + return nil + } + + files := make([]*os.File, 0, nfds) + for fd := C.SD_LISTEN_FDS_START; fd < C.SD_LISTEN_FDS_START+nfds; fd++ { + syscall.CloseOnExec(fd) + files = append(files, os.NewFile(uintptr(fd), "LISTEN_FD_"+strconv.Itoa(fd))) + } + + return files +} diff --git a/sd_daemon/logger/logger.go b/sd_daemon/logger/logger.go new file mode 100644 index 0000000..6c09604 --- /dev/null +++ b/sd_daemon/logger/logger.go @@ -0,0 +1,23 @@ +package logger + +import ( + "fmt" + "os" +) + +//#include +import "C" + +func log(level string, format string, a ...interface{}) { + f := level + format + "\n" + fmt.Fprintf(os.Stderr, f, a) +} + +/* system is unusable */ func Emerg( format string, a ...interface{}) { log(C.SD_EMERG , format, a); } +/* action must be taken immediately */ func Alert( format string, a ...interface{}) { log(C.SD_ALERT , format, a); } +/* critical conditions */ func Crit( format string, a ...interface{}) { log(C.SD_CRIT , format, a); } +/* error conditions */ func Err( format string, a ...interface{}) { log(C.SD_ERR , format, a); } +/* warning conditions */ func Warning(format string, a ...interface{}) { log(C.SD_WARNING, format, a); } +/* normal but significant condition */ func Notice( format string, a ...interface{}) { log(C.SD_NOTICE , format, a); } +/* informational */ func Info( format string, a ...interface{}) { log(C.SD_INFO , format, a); } +/* debug-level messages */ func Debug( format string, a ...interface{}) { log(C.SD_DEBUG , format, a); } -- cgit v1.2.3-54-g00ecf