Skip to content

Commit

Permalink
Add proxy to faasd up
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
  • Loading branch information
alexellis committed Dec 29, 2019
1 parent 52baca9 commit ff0cccf
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 1 deletion.
7 changes: 7 additions & 0 deletions cmd/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ func runUp(_ *cobra.Command, _ []string) error {
log.Printf("Supervisor init done in: %s\n", time.Since(start).String())

shutdownTimeout := time.Second * 1
timeout := time.Second * 60

wg := sync.WaitGroup{}
wg.Add(1)
Expand All @@ -85,6 +86,12 @@ func runUp(_ *cobra.Command, _ []string) error {
})
}()

go func() {
wd, _ := os.Getwd()
proxy := pkg.NewProxy(path.Join(wd, "hosts"), timeout)
proxy.Start()
}()

wg.Wait()
return nil
}
Expand Down
33 changes: 33 additions & 0 deletions pkg/proxy.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package pkg

import (
"fmt"
"net/http"

"time"
)

func NewProxy(hosts string, timeout time.Duration) *Proxy {

return &Proxy{
Hosts: hosts,
Timeout: timeout,
}
}

type Proxy struct {
Hosts string
Timeout time.Duration
}

func (p *Proxy) Start() error {
tcp := 8080
s := &http.Server{
Addr: fmt.Sprintf(":%d", tcp),
ReadTimeout: p.Timeout,
WriteTimeout: p.Timeout,
MaxHeaderBytes: 1 << 20, // Max header of 1MB
}

return s.ListenAndServe()
}
1 change: 0 additions & 1 deletion pkg/supervisor.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ func (s *Supervisor) Start(svcs []Service) error {
}
log.Println("Exited: ", exitStatusC)

// call start on the task to execute the redis server
if err := task.Start(ctx); err != nil {
log.Println("Task err: ", err)
return err
Expand Down

0 comments on commit ff0cccf

Please sign in to comment.