|
|
@@ -71,11 +71,39 @@ func init() {
|
|
|
flag.StringVarP(&effectImportPath, "effect", "e", "", "effect import data from here")
|
|
|
}
|
|
|
|
|
|
+func Cors(next http.Handler) http.Handler {
|
|
|
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
|
+ w.Header().Set("Access-Control-Allow-Origin", "*")
|
|
|
+ w.Header().Set("Access-Control-Allow-Methods", "*")
|
|
|
+ w.Header().Set("Access-Control-Allow-Headers", "*")
|
|
|
+ w.Header().Set("Access-Control-Allow-Credentials", "true")
|
|
|
+ log.Infof("Should set headers")
|
|
|
+
|
|
|
+ if r.Method == "OPTIONS" {
|
|
|
+ log.Infof("Should return for OPTIONS")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ next.ServeHTTP(w, r)
|
|
|
+ })
|
|
|
+}
|
|
|
+
|
|
|
func routes() *chi.Mux {
|
|
|
//myHandler := api.NewSysAPIHandler(apikey)
|
|
|
baseURL := fmt.Sprintf("/api/v%s", apiVersion)
|
|
|
router := chi.NewRouter()
|
|
|
router.Use(
|
|
|
+ Cors,
|
|
|
+ /* cors.Handler(cors.Options{
|
|
|
+ // AllowedOrigins: []string{"https://foo.com"}, // Use this to allow specific origin hosts
|
|
|
+ AllowedOrigins: []string{"*"},
|
|
|
+ // AllowOriginFunc: func(r *http.Request, origin string) bool { return true },
|
|
|
+ AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
|
|
|
+ AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
|
|
|
+ ExposedHeaders: []string{"Link"},
|
|
|
+ AllowCredentials: true,
|
|
|
+ MaxAge: 300, // Maximum value not ignored by any of major browsers
|
|
|
+ }),
|
|
|
+ */
|
|
|
render.SetContentType(render.ContentTypeJSON),
|
|
|
middleware.Logger,
|
|
|
middleware.DefaultCompress,
|
|
|
@@ -130,7 +158,7 @@ func main() {
|
|
|
defer log.Close()
|
|
|
|
|
|
gc := crypt.GenerateCertificate{
|
|
|
- Organization: "MCS Media Computer Spftware",
|
|
|
+ Organization: "MCS Media Computer Software",
|
|
|
Host: "127.0.0.1",
|
|
|
ValidFor: 10 * 365 * 24 * time.Hour,
|
|
|
IsCA: false,
|
|
|
@@ -181,6 +209,7 @@ func main() {
|
|
|
}
|
|
|
|
|
|
var sslsrv *http.Server
|
|
|
+ var srv *http.Server
|
|
|
if ssl {
|
|
|
tlsConfig, err := gc.GenerateTLSConfig()
|
|
|
if err != nil {
|
|
|
@@ -200,23 +229,35 @@ func main() {
|
|
|
log.Alertf("error starting server: %s", err.Error())
|
|
|
}
|
|
|
}()
|
|
|
- }
|
|
|
-
|
|
|
- // own http server for the healthchecks
|
|
|
- srv := &http.Server{
|
|
|
- Addr: "0.0.0.0:" + strconv.Itoa(serviceConfig.Port),
|
|
|
- WriteTimeout: time.Second * 15,
|
|
|
- ReadTimeout: time.Second * 15,
|
|
|
- IdleTimeout: time.Second * 60,
|
|
|
- Handler: healthRouter,
|
|
|
- }
|
|
|
-
|
|
|
- go func() {
|
|
|
- log.Infof("starting http server on address: %s", srv.Addr)
|
|
|
- if err := srv.ListenAndServe(); err != nil {
|
|
|
- log.Alertf("error starting server: %s", err.Error())
|
|
|
+ srv = &http.Server{
|
|
|
+ Addr: "0.0.0.0:" + strconv.Itoa(serviceConfig.Port),
|
|
|
+ WriteTimeout: time.Second * 15,
|
|
|
+ ReadTimeout: time.Second * 15,
|
|
|
+ IdleTimeout: time.Second * 60,
|
|
|
+ Handler: healthRouter,
|
|
|
}
|
|
|
- }()
|
|
|
+ go func() {
|
|
|
+ log.Infof("starting http server on address: %s", srv.Addr)
|
|
|
+ if err := srv.ListenAndServe(); err != nil {
|
|
|
+ log.Alertf("error starting server: %s", err.Error())
|
|
|
+ }
|
|
|
+ }()
|
|
|
+ } else {
|
|
|
+ // own http server for the healthchecks
|
|
|
+ srv = &http.Server{
|
|
|
+ Addr: "0.0.0.0:" + strconv.Itoa(serviceConfig.Port),
|
|
|
+ WriteTimeout: time.Second * 15,
|
|
|
+ ReadTimeout: time.Second * 15,
|
|
|
+ IdleTimeout: time.Second * 60,
|
|
|
+ Handler: router,
|
|
|
+ }
|
|
|
+ go func() {
|
|
|
+ log.Infof("starting http server on address: %s", srv.Addr)
|
|
|
+ if err := srv.ListenAndServe(); err != nil {
|
|
|
+ log.Alertf("error starting server: %s", err.Error())
|
|
|
+ }
|
|
|
+ }()
|
|
|
+ }
|
|
|
|
|
|
if serviceConfig.RegistryURL != "" {
|
|
|
initRegistry()
|
