gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-09-16 07:56:24 -07:00
Code Releases Activity

add verbosity options, build timestamp in build.sh

Browse source
This commit is contained in:
Joshua Merrell 2016-01-03 23:23:04 -08:00
parent 90d661fc25
commit a1d57480a6
4 changed files with 58 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build.sh
View file

@ -5,6 +5,9 @@ then
echo "\$GOPATH not set. Please run 'export GOPATH=\$PWD/lib' (or wherever you prefer) and run this again."
exit
fi
GOCHAN_VERBOSE=0
GOCHAN_VERSION="0.9"
GOCHAN_BUILDTIME=$(date +%y%m%d.%H%m)
CGO_ENABLED=0
GOARCH=amd64
SUFFIX=""
@ -13,5 +16,5 @@ then
SUFFIX=".exe"
fi
go build -v -ldflags "-w" -o gochan$SUFFIX ./src
go build -v -ldflags "-w -X main.version $GOCHAN_VERSION -X main.buildtime_str $GOCHAN_BUILDTIME -X main.verbose_str $GOCHAN_VERBOSE" -o gochan$SUFFIX ./src
# the -w ldflag omits debugging stuff

21
src/gochan.go
View file

@ -1,20 +1,31 @@
package main
import (
"fmt"
"strconv"
)
const version float32 = 0.9
// set in build.sh via -ldflags
var version string
// verbose = 0 for no debugging info. Critical errors and general output only
// verbose = 1 for non-critical warnings and important info
// verbose = 2 for all debugging/benchmarks/warnings
// set in build.sh via -ldflags
var verbose_str string
var buildtime_str string // set in build.sh, format: YRMMDD.HHMM
func main() {
defer db.Close()
initConfig()
fmt.Printf("Config file loaded. Connecting to database...")
config.Verbosity, _ = strconv.Atoi(verbose_str)
config.Version = version
printf(0, "Starting gochan v%s.%s, using verbosity level %d\n", config.Version, buildtime_str, config.Verbosity)
printf(0, "Config file loaded. Connecting to database...")
connectToSQLServer()
fmt.Println("Loading and parsing templates...")
println(0, "Loading and parsing templates...")
initTemplates()
fmt.Println("Initializing server...")
println(0, "Initializing server...")
if db != nil {
db.Exec("USE `" + config.DBname + "`;")
}

50
src/types.go
View file

@ -1,7 +1,6 @@
package main
import (
"fmt"
"github.com/postfix/goconf"
"log"
"os"
@ -335,32 +334,33 @@ type GochanConfig struct {
EnableAppeals bool
MaxModlogDays int
RandomSeed string
Version float32
Version string
Verbosity int
}
func initConfig() {
var err error
c, err = goconf.ReadConfigFile("config.cfg")
if err != nil {
fmt.Println(err)
println(0, err.Error())
os.Exit(2)
}
config.IName = "GochanConfig"
config.Domain, err = c.GetString("server", "domain")
if err != nil {
fmt.Println("server.domain not set in config.cfg, halting.")
println(0, "server.domain not set in config.cfg, halting.")
}
config.Port, err = c.GetInt("server", "port")
if err != nil {
config.Port = 80
fmt.Println("server.port not set in config.cfg, defaulting to 80")
println(0, "server.port not set in config.cfg, defaulting to 80")
}
first_page_str, err_ := c.GetString("server", "first_page")
if err_ != nil {
first_page_str = "board.html,index.html"
fmt.Println("server.first_page not set in config.cfg, defaulting to " + first_page_str)
println(0, "server.first_page not set in config.cfg, defaulting to "+first_page_str)
}
config.FirstPage = strings.Split(first_page_str, ",")
@ -368,18 +368,18 @@ func initConfig() {
config.Error404Path, err = c.GetString("server", "error_404_path")
if err != nil {
config.Error404Path = "/error/404.html"
fmt.Println("server.error_404_path not set in config.cfg, defaulting to " + config.Error404Path)
println(0, "server.error_404_path not set in config.cfg, defaulting to "+config.Error404Path)
}
config.Error500Path, err = c.GetString("server", "error_500_path")
if err != nil {
config.Error500Path = "/error/500.html"
fmt.Println("server.error_500_path not set in config.cfg, defaulting to " + config.Error500Path)
println(0, "server.error_500_path not set in config.cfg, defaulting to "+config.Error500Path)
}
config.Username, err = c.GetString("server", "username")
if err != nil {
config.Username = "gochan"
fmt.Println("server.username not set in config.cfg, defaulting to " + config.Username)
println(0, "server.username not set in config.cfg, defaulting to "+config.Username)
}
config.UseFastCGI, err = c.GetBool("server", "use_fastcgi")
@ -389,7 +389,7 @@ func initConfig() {
config.DocumentRoot, err = c.GetString("directories", "document_root")
if err != nil {
fmt.Println("directories.document_root not set in config.cfg, halting.")
println(0, "directories.document_root not set in config.cfg, halting.")
os.Exit(2)
}
wd, wderr := os.Getwd()
@ -403,18 +403,18 @@ func initConfig() {
config.TemplateDir, err = c.GetString("directories", "template_dir")
if err != nil {
config.TemplateDir = "templates"
fmt.Println("directories.template_dir not set in config.cfg, defaulting to " + config.TemplateDir)
println(0, "directories.template_dir not set in config.cfg, defaulting to "+config.TemplateDir)
}
config.LogDir, err = c.GetString("directories", "log_dir")
if err != nil {
config.LogDir = "log"
fmt.Println("directories.log_dir not set in config.cfg, defaulting to " + config.LogDir)
println(0, "directories.log_dir not set in config.cfg, defaulting to "+config.LogDir)
}
access_log_f, err := os.OpenFile(path.Join(config.LogDir, "access.log"), os.O_RDWR|os.O_CREATE, 0777)
if err != nil {
fmt.Println("Couldn't open access log. Returned error: " + err.Error())
println(0, "Couldn't open access log. Returned error: "+err.Error())
os.Exit(1)
} else {
access_log = log.New(access_log_f, "", log.Ltime|log.Ldate)
@ -423,7 +423,7 @@ func initConfig() {
error_log_f, err := os.OpenFile(path.Join(config.LogDir, "error.log"), os.O_RDWR|os.O_CREATE, 0777)
if err != nil {
fmt.Println("Couldn't open error log. Returned error: " + err.Error())
println(0, "Couldn't open error log. Returned error: "+err.Error())
os.Exit(1)
} else {
error_log = log.New(error_log_f, "", log.Ltime|log.Ldate)
@ -431,7 +431,7 @@ func initConfig() {
mod_log_f, err := os.OpenFile(path.Join(config.LogDir, "mod.log"), os.O_RDWR|os.O_CREATE, 0777)
if err != nil {
fmt.Println("Couldn't open mod log. Returned error: " + err.Error())
println(0, "Couldn't open mod log. Returned error: "+err.Error())
} else {
mod_log = log.New(mod_log_f, "", log.Ltime|log.Ldate)
}
@ -439,24 +439,24 @@ func initConfig() {
config.DBtype, err = c.GetString("database", "type")
if err != nil {
config.DBtype = "mysql"
fmt.Println("database.db_type not set in config.cfg, defaulting to " + config.DBtype)
println(0, "database.db_type not set in config.cfg, defaulting to "+config.DBtype)
}
config.DBhost, err = c.GetString("database", "host")
if err != nil {
config.DBhost = "unix(/var/run/mysqld/mysqld.sock)"
fmt.Println("database.db_host not set in config.cfg, defaulting to " + config.DBhost)
println(0, "database.db_host not set in config.cfg, defaulting to "+config.DBhost)
}
config.DBname, err = c.GetString("database", "name")
if err != nil {
fmt.Println("database.db_name not set in config.cfg, halting.")
println(0, "database.db_name not set in config.cfg, halting.")
os.Exit(2)
}
config.DBusername, err = c.GetString("database", "username")
if err != nil {
fmt.Println("database.db_username not set in config.cfg, halting.")
println(0, "database.db_username not set in config.cfg, halting.")
os.Exit(2)
}
config.DBpassword, err = c.GetString("database", "password")
@ -511,7 +511,7 @@ func initConfig() {
config.SiteWebfolder, err = c.GetString("site", "webfolder")
if err != nil {
fmt.Println("site.webfolder not set in config.cfg, halting.")
println(0, "site.webfolder not set in config.cfg, halting.")
os.Exit(2)
}
@ -661,12 +661,10 @@ func initConfig() {
config.EnableGeoIP = false
}
config.GeoIPDBlocation, err = c.GetString("misc", "geoip_location") // cf for cloudflare or a local path
if err != nil {
if config.EnableGeoIP {
fmt.Println("Error: GeoIP enabled but no database provided. Set misc.geoip_location in config.cfg to \"cf\" to use CloudFlare's GeoIP headers, or to a local filepath")
} else {
config.GeoIPDBlocation = ""
if config.EnableGeoIP {
config.GeoIPDBlocation, err = c.GetString("misc", "geoip_location") // cf for cloudflare or a local path
if err != nil {
println(0, "Error: GeoIP enabled but no database provided. Set misc.geoip_location in config.cfg to \"cf\" to use CloudFlare's GeoIP headers, or to a local filepath")
}
}

24
src/util.go
View file

@ -28,14 +28,12 @@ const (
func benchmarkTimer(name string, given_time time.Time, starting bool) time.Time {
if starting {
// starting benchmark test
fmt.Println("Starting benchmark \"" + name + "\"")
println(2, "Starting benchmark \""+name+"\"")
return given_time
} else {
// benchmark is finished, print the duration
// convert nanoseconds to a decimal seconds
duration_seconds := time.Since(given_time).Seconds()
seconds := fmt.Sprintf("%0.02f", duration_seconds)
fmt.Println("benchmark \"" + name + "\" completed in " + seconds + "seconds")
printf(2, "benchmark %s completed in %d seconds", name, time.Since(given_time).Seconds())
return time.Now() // we don't really need this, but we have to return something
}
}
@ -56,7 +54,6 @@ func bcrypt_sum(str string) string {
hash := ""
digest, err := bcrypt.GenerateFromPassword([]byte(str), 4)
if err == nil {
//hash = fmt.Sprintf("%x",digest)
hash = string(digest)
}
return hash
@ -144,7 +141,6 @@ func getBoardArr(where string) (boards []BoardsTable, err error) {
return
}
func getPostArr(sql string) (posts []interface{}, err error) {
rows, err := db.Query(sql)
if err != nil {
@ -217,18 +213,14 @@ func getFileExtension(filename string) string {
} else {
return filename[strings.LastIndex(filename, ".")+1:]
}
//}
//return ""
}
func getFormattedFilesize(size float32) string {
if size < 1000 {
return fmt.Sprintf("%fB", size)
} else if size <= 100000 {
//size = size * 0.2
return fmt.Sprintf("%fKB", size/1024)
} else if size <= 100000000 {
//size = size * 0.2
return fmt.Sprintf("%fMB", size/1024/1024)
}
return fmt.Sprintf("%0.2fGB", size/1024/1024/1024)
@ -273,6 +265,18 @@ func paginate(interface_length int, interf []interface{}) [][]interface{} {
return paginated_interfaces
}
func printf(v int, format string, a ...interface{}) {
if config.Verbosity >= v {
fmt.Printf(format, a...)
}
}
func println(v int, s string) {
if config.Verbosity >= v {
fmt.Println(s)
}
}
func resetBoardSectionArrays() {
// run when the board list needs to be changed (board/section is added, deleted, etc)
all_boards = nil