Tested version of new db status server version

pull/359/head
kompotkot 2021-11-03 10:27:44 +00:00
rodzic 96af47c86f
commit 33affe4e9f
4 zmienionych plików z 18 dodań i 9 usunięć

Wyświetl plik

@ -1,7 +1,6 @@
package cmd package cmd
import ( import (
"fmt"
"log" "log"
"net/http" "net/http"
"strings" "strings"
@ -29,7 +28,7 @@ func logsMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
start := time.Now() start := time.Now()
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
fmt.Printf("[%s] %s %s %s\n", time.Since(start), r.Method, r.URL.Path, r.RemoteAddr) log.Printf("%s %s %s %s\n", time.Since(start), r.Method, r.URL.Path, r.RemoteAddr)
}) })
} }

Wyświetl plik

@ -1,7 +1,9 @@
package cmd package cmd
import ( import (
"database/sql"
"encoding/json" "encoding/json"
"log"
"net/http" "net/http"
) )
@ -16,8 +18,17 @@ func (es *extendedServer) blocksLatestRoute(w http.ResponseWriter, req *http.Req
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
var latestBlock BlockNumberResponse var latestBlock BlockNumberResponse
query := "SELECT block_number FROM ethereum_blocks ORDER BY block_number DESC LIMIT 1" row := es.db.QueryRow("SELECT block_number FROM ethereum_blocks ORDER BY block_number DESC LIMIT 1")
es.db.Raw(query, 1).Scan(&latestBlock.BlockNumber) err := row.Scan(&latestBlock.BlockNumber)
if err != nil {
if err == sql.ErrNoRows {
http.Error(w, "Row not found", http.StatusNotFound)
} else {
http.Error(w, "Internal server error", http.StatusInternalServerError)
}
log.Printf("An error occurred during sql operation: %s", err)
return
}
json.NewEncoder(w).Encode(latestBlock) json.NewEncoder(w).Encode(latestBlock)
} }

Wyświetl plik

@ -1,3 +1,2 @@
export MOONSTREAM_DB_SERVER_PORT="8080"
export MOONSTREAM_DB_URI="postgresql://<username>:<password>@<db_host>:<db_port>/<db_name>" export MOONSTREAM_DB_URI="postgresql://<username>:<password>@<db_host>:<db_port>/<db_name>"
export MOONSTREAM_CORS_ALLOWED_ORIGINS="http://localhost:3000,https://moonstream.to,https://www.moonstream.to,https://alpha.moonstream.to" export MOONSTREAM_CORS_ALLOWED_ORIGINS="http://localhost:3000,https://moonstream.to,https://www.moonstream.to,https://alpha.moonstream.to"