From b891a95fcf4a3d4b64100911dae49fb28904a7fd Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 13 May 2020 14:07:44 +0200
Subject: Rename project to alps

---
 cmd/alps/main.go    | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 cmd/koushin/main.go | 74 -----------------------------------------------------
 2 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 cmd/alps/main.go
 delete mode 100644 cmd/koushin/main.go

(limited to 'cmd')

diff --git a/cmd/alps/main.go b/cmd/alps/main.go
new file mode 100644
index 0000000..c0b77f2
--- /dev/null
+++ b/cmd/alps/main.go
@@ -0,0 +1,74 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"git.sr.ht/~emersion/alps"
+	"github.com/labstack/echo/v4"
+	"github.com/labstack/echo/v4/middleware"
+	"github.com/labstack/gommon/log"
+
+	_ "git.sr.ht/~emersion/alps/plugins/base"
+	_ "git.sr.ht/~emersion/alps/plugins/caldav"
+	_ "git.sr.ht/~emersion/alps/plugins/carddav"
+	_ "git.sr.ht/~emersion/alps/plugins/lua"
+	_ "git.sr.ht/~emersion/alps/plugins/viewhtml"
+	_ "git.sr.ht/~emersion/alps/plugins/viewtext"
+)
+
+func main() {
+	var options alps.Options
+	var addr string
+	flag.StringVar(&options.Theme, "theme", "", "default theme")
+	flag.StringVar(&addr, "addr", ":1323", "listening address")
+	flag.BoolVar(&options.Debug, "debug", false, "enable debug logs")
+
+	flag.Usage = func() {
+		fmt.Fprintf(flag.CommandLine.Output(), "usage: alps [options...] <upstream servers...>\n")
+		flag.PrintDefaults()
+	}
+
+	flag.Parse()
+
+	options.Upstreams = flag.Args()
+	if len(options.Upstreams) == 0 {
+		flag.Usage()
+		return
+	}
+
+	e := echo.New()
+	e.HideBanner = true
+	if l, ok := e.Logger.(*log.Logger); ok {
+		l.SetHeader("${time_rfc3339} ${level}")
+	}
+	s, err := alps.New(e, &options)
+	if err != nil {
+		e.Logger.Fatal(err)
+	}
+	e.Use(middleware.Recover())
+	if options.Debug {
+		e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
+			Format: "${time_rfc3339} method=${method}, uri=${uri}, status=${status}\n",
+		}))
+	}
+
+	if options.Debug {
+		e.Logger.SetLevel(log.DEBUG)
+	}
+
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGUSR1)
+	go func() {
+		for range sigs {
+			if err := s.Reload(); err != nil {
+				e.Logger.Errorf("Failed to reload server: %v", err)
+			}
+		}
+	}()
+
+	e.Logger.Fatal(e.Start(addr))
+}
diff --git a/cmd/koushin/main.go b/cmd/koushin/main.go
deleted file mode 100644
index d9edfc9..0000000
--- a/cmd/koushin/main.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"git.sr.ht/~emersion/koushin"
-	"github.com/labstack/echo/v4"
-	"github.com/labstack/echo/v4/middleware"
-	"github.com/labstack/gommon/log"
-
-	_ "git.sr.ht/~emersion/koushin/plugins/base"
-	_ "git.sr.ht/~emersion/koushin/plugins/caldav"
-	_ "git.sr.ht/~emersion/koushin/plugins/carddav"
-	_ "git.sr.ht/~emersion/koushin/plugins/lua"
-	_ "git.sr.ht/~emersion/koushin/plugins/viewhtml"
-	_ "git.sr.ht/~emersion/koushin/plugins/viewtext"
-)
-
-func main() {
-	var options koushin.Options
-	var addr string
-	flag.StringVar(&options.Theme, "theme", "", "default theme")
-	flag.StringVar(&addr, "addr", ":1323", "listening address")
-	flag.BoolVar(&options.Debug, "debug", false, "enable debug logs")
-
-	flag.Usage = func() {
-		fmt.Fprintf(flag.CommandLine.Output(), "usage: koushin [options...] <upstream servers...>\n")
-		flag.PrintDefaults()
-	}
-
-	flag.Parse()
-
-	options.Upstreams = flag.Args()
-	if len(options.Upstreams) == 0 {
-		flag.Usage()
-		return
-	}
-
-	e := echo.New()
-	e.HideBanner = true
-	if l, ok := e.Logger.(*log.Logger); ok {
-		l.SetHeader("${time_rfc3339} ${level}")
-	}
-	s, err := koushin.New(e, &options)
-	if err != nil {
-		e.Logger.Fatal(err)
-	}
-	e.Use(middleware.Recover())
-	if options.Debug {
-		e.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
-			Format: "${time_rfc3339} method=${method}, uri=${uri}, status=${status}\n",
-		}))
-	}
-
-	if options.Debug {
-		e.Logger.SetLevel(log.DEBUG)
-	}
-
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGUSR1)
-	go func() {
-		for range sigs {
-			if err := s.Reload(); err != nil {
-				e.Logger.Errorf("Failed to reload server: %v", err)
-			}
-		}
-	}()
-
-	e.Logger.Fatal(e.Start(addr))
-}
-- 
cgit v1.2.3