unix domain

Author: tohutohu

app/webapp/go/main.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"os"
 	"os/exec"
@@ -276,8 +277,30 @@ func main() {
 	go trendUpdater()
 	go insertIsuCondition()
 
-	serverPort := fmt.Sprintf(":%v", getEnv("SERVER_APP_PORT", "3000"))
-	e.Logger.Fatal(e.Start(serverPort))
+	if (getEnv("USE_SOCKET", "0") == "1") {
+		// ここからソケット接続設定 ---
+		socket_file := "/var/run/app.sock"
+		os.Remove(socket_file)
+
+		l, err := net.Listen("unix", socket_file)
+		if err != nil {
+			e.Logger.Fatal(err)
+		}
+
+		// go runユーザとnginxのユーザ（グループ）を同じにすれば777じゃなくてok
+		err = os.Chmod(socket_file, 0777)
+		if err != nil {
+			e.Logger.Fatal(err)
+		}
+
+		e.Listener = l
+		e.Logger.Fatal(e.Start(""))
+		// ここまで ---
+	} else {
+		serverPort := fmt.Sprintf(":%v", getEnv("SERVER_APP_PORT", "3000"))
+		e.Logger.Fatal(e.Start(serverPort))
+	}
+
 }
 
 func selectDBIndex(id string) int {

s1/deploy.sh

@@ -3,6 +3,7 @@
 sudo cp -f etc/mysql/mariadb.conf.d/50-server.cnf /etc/mysql/mariadb.conf.d/50-server.cnf
 sudo cp -f etc/nginx/nginx.conf /etc/nginx/nginx.conf
 sudo cp -f etc/nginx/sites-available/isucondition.conf /etc/nginx/sites-available/isucondition.conf
+sudo cp -f home/isucon/env.sh /home/isucon/env.sh
 
 #cp -f env /home/isucon/env
 

s1/etc/nginx/sites-available/isucondition.conf

@@ -5,6 +5,10 @@ upstream app {
     server isucondition-3.t.isucon.dev:3000;
 }
 
+upstream unix_domain_server {
+	server unix:/var/run/app.sock;
+}
+
 server {
     listen 443 ssl http2;
 
@@ -64,7 +68,7 @@ server {
         limit_except GET {
             proxy_pass http://app;
         }
-        proxy_pass http://127.0.0.1:3000;
+        proxy_pass http://unix_domain_server;
     }
 
     location ~ ^/api/isu/.*/graph$ {
@@ -75,14 +79,14 @@ server {
         limit_except GET {
             proxy_pass http://app;
         }
-        proxy_pass http://127.0.0.1:3000;
+        proxy_pass http://unix_domain_server;
     }
 
     location @webapp {
         proxy_http_version 1.1;
         proxy_set_header Connection "";
         proxy_set_header Host $http_host;
 
-        proxy_pass http://127.0.0.1:3000;
+        proxy_pass http://unix_domain_server;
     }
 }

s1/home/isucon/env.sh

@@ -0,0 +1,7 @@
+MYSQL_HOST="127.0.0.1"
+MYSQL_PORT=3306
+MYSQL_USER=isucon
+MYSQL_DBNAME=isucondition
+MYSQL_PASS=isucon
+POST_ISUCONDITION_TARGET_BASE_URL="https://isucondition-1.t.isucon.dev"
+USE_SOCKERT=1