github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1 from crosbymichael/runtime-v2-windows

Browse Source 
Add Windows Publisher and Signal Handler
This commit is contained in:
Justin 2018-07-26 10:07:14 -07:00 committed by GitHub
commit 965cca6f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/v2/shim/shim_windows.go
View File

@ -19,13 +19,17 @@
package shim package shim
import ( import (
"bytes"
"context" "context"
"net" "net"
"os" "os"
"os/exec"
winio "github.com/Microsoft/go-winio" winio "github.com/Microsoft/go-winio"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
"github.com/containerd/typeurl"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -33,7 +37,6 @@ import (
// setupSignals creates a new signal handler for all signals // setupSignals creates a new signal handler for all signals
func setupSignals() (chan os.Signal, error) { func setupSignals() (chan os.Signal, error) {
signals := make(chan os.Signal, 32) signals := make(chan os.Signal, 32)
// TODO: JTERRY75: Make this based on events.
return signals, nil return signals, nil
} }
@ -63,12 +66,11 @@ func serveListener(path string) (net.Listener, string, error) {
} }
func handleSignals(logger *logrus.Entry, signals chan os.Signal) error { func handleSignals(logger *logrus.Entry, signals chan os.Signal) error {
// TODO: JTERRY75: Make this based on events? <-signals
return nil return nil
} }
func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event events.Event) error { func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event events.Event) error {
/* TOOD: JTERRY75: Implement publish for windows
ns, _ := namespaces.Namespace(ctx) ns, _ := namespaces.Namespace(ctx)
encoded, err := typeurl.MarshalAny(event) encoded, err := typeurl.MarshalAny(event)
if err != nil { if err != nil {
@ -80,17 +82,5 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
} }
cmd := exec.CommandContext(ctx, l.containerdBinaryPath, "--address", l.address, "publish", "--topic", topic, "--namespace", ns) cmd := exec.CommandContext(ctx, l.containerdBinaryPath, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)
cmd.Stdin = bytes.NewReader(data) cmd.Stdin = bytes.NewReader(data)
c, err := Default.Start(cmd) return cmd.Run()
if err != nil {
return err
}
status, err := Default.Wait(cmd, c)
if err != nil {
return err
}
if status != 0 {
return errors.New("failed to publish event")
}
*/
return nil
} }