a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

You can now disable the search subsystem. 

Try Travis with MariaDB 12...
This commit is contained in:
Azareal 2019-02-23 16:55:34 +10:00
parent 6b56d69fc8
commit cf4a9d1738
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -24,4 +24,4 @@ script: ./run-linux-tests
after_script: after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
addons: addons:
mariadb: '10.0' mariadb: '12.0'

2
common/site.go
View File

@ -72,6 +72,8 @@ type config struct {
SMTPPort string SMTPPort string
//SMTPEnableTLS bool //SMTPEnableTLS bool
Search string
DefaultPath string DefaultPath string
DefaultGroup int // Should be a setting in the database DefaultGroup int // Should be a setting in the database
ActivationGroup int // Should be a setting in the database ActivationGroup int // Should be a setting in the database

2
docs/configuration.md
View File

@ -42,6 +42,8 @@ SMTPPassword - The password for the SMTP server.
SMTPPort - The port for the SMTP server, usually 25. SMTPPort - The port for the SMTP server, usually 25.
Search - The type of search system to use. Options: disabled, sql (default)
MaxRequestSizeStr - The maximum size that a request made to Gosora can be. This includes uploads. Example: 5MB MaxRequestSizeStr - The maximum size that a request made to Gosora can be. This includes uploads. Example: 5MB
UserCache - The type of user cache you want to use. You can leave this blank to disable this feature or use `static` for a small in-memory cache. UserCache - The type of user cache you want to use. You can leave this blank to disable this feature or use `static` for a small in-memory cache.

3
install/mysql.go
View File

@ -1,7 +1,7 @@
/* /*
* *
* Gosora MySQL Interface * Gosora MySQL Interface
* Copyright Azareal 2017 - 2019 * Copyright Azareal 2017 - 2020
* *
*/ */
package install package install
@ -137,6 +137,7 @@ func (ins *MysqlInstaller) TableDefs() (err error) {
_, err = ins.db.Exec(string(data)) _, err = ins.db.Exec(string(data))
if err != nil { if err != nil {
fmt.Println("Failed query:", string(data)) fmt.Println("Failed query:", string(data))
panic("Failed query:", string(data))
return err return err
} }
} }

8
main.go
View File

@ -143,9 +143,11 @@ func afterDBInit() (err error) {
if err != nil { if err != nil {
return errors.WithStack(err) return errors.WithStack(err)
} }
common.RepliesSearch, err = common.NewSQLSearcher(acc) if common.Config.Search == "" || common.Config.Search == "sql" {
if err != nil { common.RepliesSearch, err = common.NewSQLSearcher(acc)
return errors.WithStack(err) if err != nil {
return errors.WithStack(err)
}
} }
common.Subscriptions, err = common.NewDefaultSubscriptionStore() common.Subscriptions, err = common.NewDefaultSubscriptionStore()
if err != nil { if err != nil {

2
routes/topic_list.go
View File

@ -69,7 +69,7 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user common.User, h
var forumList []common.Forum var forumList []common.Forum
var paginator common.Paginator var paginator common.Paginator
q := r.FormValue("q") q := r.FormValue("q")
if q != "" { if q != "" && common.RepliesSearch != nil {
var canSee []int var canSee []int
if user.IsSuperAdmin { if user.IsSuperAdmin {
canSee, err = common.Forums.GetAllVisibleIDs() canSee, err = common.Forums.GetAllVisibleIDs()