mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client/web: remove unused context param from NewServer 

Updates tailscale/corp#14335

Signed-off-by: Sonia Appasamy <sonia@tailscale.com>
This commit is contained in:
Sonia Appasamy 2023-10-11 14:36:47 -04:00 committed by Sonia Appasamy
parent aad3584319
commit 7a0de2997e
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/web/web.go
View File

@ -125,8 +125,7 @@ type ServerOpts struct {
}
// NewServer constructs a new Tailscale web client server.
// The provided context should live for the duration of the Server's lifetime.
func NewServer(ctx context.Context, opts ServerOpts) (s *Server, cleanup func()) {
func NewServer(opts ServerOpts) (s *Server, cleanup func()) {
if opts.LocalClient == nil {
opts.LocalClient = &tailscale.LocalClient{}
}

2
cmd/tailscale/cli/web.go
View File

@ -80,7 +80,7 @@ func runWeb(ctx context.Context, args []string) error {
return fmt.Errorf("too many non-flag arguments: %q", args)
}
webServer, cleanup := web.NewServer(ctx, web.ServerOpts{
webServer, cleanup := web.NewServer(web.ServerOpts{
DevMode: webArgs.dev,
CGIMode: webArgs.cgi,
PathPrefix: webArgs.prefix,

4
tsnet/example/web-client/web-client.go
View File

@ -5,7 +5,6 @@
package main
import (
"context"
"flag"
"log"
"net/http"
@ -21,7 +20,6 @@ var (
func main() {
flag.Parse()
ctx := context.Background()
s := new(tsnet.Server)
defer s.Close()
@ -32,7 +30,7 @@ func main() {
}
// Serve the Tailscale web client.
ws, cleanup := web.NewServer(ctx, web.ServerOpts{
ws, cleanup := web.NewServer(web.ServerOpts{
DevMode: *devMode,
LocalClient: lc,
})