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

Use unix-socket as communication channel

Browse Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	ctr/container.go
This commit is contained in:
Alexander Morozov
2015-12-14 15:54:11 -08:00
committed by Michael Crosby
parent e16dfc36a5
commit ca4191ce41
6 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
containerd/main.go
View File

@@ -57,6 +57,11 @@ var daemonFlags = []cli.Flag{
Value: 60 * time.Second,
Usage: "interval for flushing metrics to the store",
},
cli.StringFlag{
Name: "listen,l",
Value: "/run/containerd/containerd.sock",
Usage: "Address on which GRPC API will listen",
},
}
func main() {
@@ -81,6 +86,7 @@ func main() {
app.Action = func(context *cli.Context) {
if err := daemon(
context.String("id"),
context.String("listen"),
context.String("state-dir"),
context.Int("concurrency"),
); err != nil {
@@ -140,7 +146,7 @@ func processMetrics() {
}()
}
func daemon(id, stateDir string, concurrency int) error {
func daemon(id, address, stateDir string, concurrency int) error {
tasks := make(chan *containerd.StartTask, concurrency*100)
supervisor, err := containerd.NewSupervisor(id, stateDir, tasks)
if err != nil {
@@ -166,12 +172,16 @@ func daemon(id, stateDir string, concurrency int) error {
if err := supervisor.Start(); err != nil {
return err
}
l, err := net.Listen("tcp", ":8888")
if err := os.RemoveAll(address); err != nil {
return err
}
l, err := net.Listen("unix", address)
if err != nil {
return err
}
s := grpc.NewServer()
types.RegisterAPIServer(s, server.NewServer(supervisor))
logrus.Debugf("GRPC API listen on %s", address)
return s.Serve(l)
}