Some fixes
parent
60bc6071f2
commit
db142def3f
|
@ -0,0 +1,10 @@
|
|||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="run" type="GoApplicationRunConfiguration" factoryName="Go Application">
|
||||
<module name="skimmer" />
|
||||
<working_directory value="$PROJECT_DIR$" />
|
||||
<kind value="DIRECTORY" />
|
||||
<directory value="$PROJECT_DIR$/src" />
|
||||
<filePath value="$PROJECT_DIR$" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
</component>
|
|
@ -2,11 +2,13 @@ package main
|
|||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"git.tiburon.su/USEFULL/skimmer/skimmer"
|
||||
)
|
||||
|
||||
var (
|
||||
config = skimmer.Config{
|
||||
Address: "localhost:3000",
|
||||
SessionSecret: "secret123",
|
||||
RedisConfig: skimmer.RedisConfig{
|
||||
RedisAddr: "127.0.0.1:6379",
|
||||
|
@ -27,5 +29,6 @@ func init() {
|
|||
func main() {
|
||||
flag.Parse()
|
||||
api := skimmer.GetApi(&config)
|
||||
api.Run()
|
||||
fmt.Printf("Open in brouser http://%s\n", config.Address)
|
||||
api.RunOnAddr(config.Address)
|
||||
}
|
||||
|
|
|
@ -1,17 +1,14 @@
|
|||
package skimmer
|
||||
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/codegangsta/martini"
|
||||
"github.com/codegangsta/martini-contrib/render"
|
||||
"github.com/codegangsta/martini-contrib/sessions"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"github.com/codegangsta/martini-contrib/sessions"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
|
||||
|
||||
type ErrorMsg struct {
|
||||
Error string `json:"error"`
|
||||
}
|
||||
|
@ -29,6 +26,7 @@ type RedisConfig struct {
|
|||
}
|
||||
|
||||
type Config struct {
|
||||
Address string
|
||||
SessionSecret string
|
||||
Storage string
|
||||
RedisConfig
|
||||
|
@ -47,7 +45,6 @@ func GetApi(config *Config) *martini.ClassicMartini {
|
|||
memoryStorage.StartCleaning(60)
|
||||
storage = memoryStorage
|
||||
|
||||
|
||||
}
|
||||
store := sessions.NewCookieStore([]byte(config.SessionSecret))
|
||||
|
||||
|
@ -62,7 +59,6 @@ func GetApi(config *Config) *martini.ClassicMartini {
|
|||
api.Use(sessions.Sessions("my_session", store))
|
||||
api.Use(NewSessionHistoryHandler(20, "binHistory"))
|
||||
|
||||
|
||||
api.Post("/api/v1/bins/", func(r render.Render, storage Storage, history History, session sessions.Session, req *http.Request) {
|
||||
payload := Bin{}
|
||||
if err := DecodeJsonPayload(req, &payload); err != nil {
|
||||
|
|
Loading…
Reference in New Issue