mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-08-20 06:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: output machined logs to /dev/kmsg and file

Browse Source 
Since dmesg is not streamed, it becomes difficult to debug issues with
machined. This fixes that by setting up the logging of machine to go to
/dev/kmsg and to a log file.

Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
This commit is contained in:
Andrew Rynhard 2019-11-03 20:43:54 +00:00
parent 3887b1e5b6
commit e81b3d11a8
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/app/init/main.go
View File

@ -34,7 +34,7 @@ func run() (err error) {
}
// Setup logging to /dev/kmsg.
_, err = kmsg.Setup("[talos] [initramfs]")
err = kmsg.Setup("[talos] [initramfs]", false)
if err != nil {
return err
}

4
internal/app/machined/internal/phase/phase.go
View File

@ -56,8 +56,8 @@ func NewRunner(config runtime.Configurator) (*Runner, error) {
fallthrough
case runtime.Cloud:
// Setup logging to /dev/kmsg.
if _, err = kmsg.Setup("[talos]"); err != nil {
return nil, fmt.Errorf("failed to setup logging to /dev/kmsg: %w", err)
if err = kmsg.Setup("[talos]", true); err != nil {
return nil, fmt.Errorf("failed to setup logging: %w", err)
}
}

1
internal/app/machined/pkg/system/services/apid.go
View File

@ -108,7 +108,6 @@ func (o *APID) Runner(config runtime.Configurator) (runner.Runner, error) {
mounts := []specs.Mount{
{Type: "bind", Destination: "/etc/ssl", Source: "/etc/ssl", Options: []string{"bind", "ro"}},
{Type: "bind", Destination: constants.ConfigPath, Source: constants.ConfigPath, Options: []string{"rbind", "ro"}},
// Other grpc server sockets
{Type: "bind", Destination: constants.SystemRunPath, Source: constants.SystemRunPath, Options: []string{"bind", "ro"}},
}

31
internal/pkg/kmsg/kmsg.go
View File

@ -6,23 +6,44 @@ package kmsg
import (
"fmt"
"io"
"log"
"os"
"path/filepath"
"golang.org/x/sys/unix"
"github.com/talos-systems/talos/pkg/constants"
)
// Setup configures the log package to write to the kernel ring buffer via
// /dev/kmsg.
func Setup(prefix string) (*os.File, error) {
out, err := os.OpenFile("/dev/kmsg", os.O_RDWR|unix.O_CLOEXEC|unix.O_NONBLOCK|unix.O_NOCTTY, 0666)
func Setup(prefix string, withLogFile bool) error {
kmsg, err := os.OpenFile("/dev/kmsg", os.O_RDWR|unix.O_CLOEXEC|unix.O_NONBLOCK|unix.O_NOCTTY, 0666)
if err != nil {
return nil, fmt.Errorf("failed to open /dev/kmsg: %w", err)
return fmt.Errorf("failed to open /dev/kmsg: %w", err)
}
log.SetOutput(out)
var writer io.Writer = kmsg
if withLogFile {
if err := os.MkdirAll(constants.DefaultLogPath, 0700); err != nil {
return err
}
logPath := filepath.Join(constants.DefaultLogPath, "machined.log")
f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil {
return fmt.Errorf("failed to open %s: %w", logPath, err)
}
writer = io.MultiWriter(kmsg, f)
}
log.SetOutput(writer)
log.SetPrefix(prefix + " ")
log.SetFlags(0)
return out, nil
return nil
}