アクセスログ記録

hakobe · Jan 15, 2016 · 761dccd · 761dccd
1 parent db66ff5
commit 761dccd
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 4 deletions.
diff --git a/accesslogs/accesslogs.go b/accesslogs/accesslogs.go
@@ -0,0 +1,35 @@
+package accesslogs
+
+import (
+	"database/sql"
+	"time"
+)
+
+func Prepare(db *sql.DB) error {
+	sql := `
+		CREATE TABLE IF NOT EXISTS accesslogs (
+			entry_id         INT UNSIGNED NOT NULL,
+			created     TIMESTAMP NOT NULL,
+			KEY(created),
+			KEY(entry_id)
+		) ENGINE=InnoDB DEFAULT CHARSET=binary
+	`
+	_, err := db.Exec(sql)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func Access(db *sql.DB, entryID int) error {
+	sql := `
+		INSERT INTO accesslogs
+		(entry_id, created) VALUES ( ?, ? )
+	`
+	_, err := db.Exec(sql, entryID, time.Now())
+	if err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/present.go b/present.go
@@ -9,6 +9,7 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 
+	"github.com/hakobe/present/accesslogs"
 	"github.com/hakobe/present/collector"
 	"github.com/hakobe/present/config"
 	"github.com/hakobe/present/entries"
@@ -51,7 +52,7 @@ func postTags(db *sql.DB) {
 		return
 	}
 	log.Printf("Posting tags: %s\n", strings.Join(tags, ", "))
-	err = slackIncoming.Post("Watching tags: " + strings.Join(tags, ", "), "")
+	err = slackIncoming.Post("Watching tags: "+strings.Join(tags, ", "), "")
 	if err != nil {
 		log.Printf("%v\n", err)
 		return
@@ -109,11 +110,15 @@ func main() {
 
 	err = entries.Prepare(db)
 	if err != nil {
-		log.Fatalf("Db(entries) preparation error: %v\n", err)
+		log.Fatalf("DB(entries) preparation error: %v\n", err)
 	}
 	err = tags.Prepare(db)
 	if err != nil {
-		log.Fatalf("Db(tags) preparation error: %v\n", err)
+		log.Fatalf("DB(tags) preparation error: %v\n", err)
+	}
+	err = accesslogs.Prepare(db)
+	if err != nil {
+		log.Fatalf("DB(accesslogs) preparation error: %v\n", err)
 	}
 
 	collectedEntries, updateTags := collector.Start()

diff --git a/web/web.go b/web/web.go
@@ -5,10 +5,12 @@ import (
 	"html/template"
 	"log"
 	"net/http"
+	"net/url"
 	"os"
 	"regexp"
 	"strconv"
 
+	"github.com/hakobe/present/accesslogs"
 	"github.com/hakobe/present/entries"
 	slackOutgoing "github.com/hakobe/present/slack/outgoing"
 )
@@ -79,7 +81,21 @@ func Start(db *sql.DB) chan *slackOutgoing.Op {
 				http.Error(rw, err.Error(), http.StatusInternalServerError)
 				return
 			}
-			http.Redirect(rw, r, entry.Url(), http.StatusFound)
+			accesslogs.Access(db, id)
+			tmpl, err := template.New("entry").Parse(`
+<html>
+<body></body>
+<head>
+  <meta http-equiv="refresh" content="0;URL=data:text/html,%3Cmeta%20http-equiv%3D%22refresh%22%20content%3D%220%3BURL%3D{{.}}%22%3E"></meta>
+</head>
+</html>
+		`)
+			if err != nil {
+				http.Error(rw, err.Error(), http.StatusInternalServerError)
+				return
+			}
+
+			tmpl.Execute(rw, template.HTML(url.QueryEscape(entry.Url())))
 		},
 	)