Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 23:59:47 +02:00
Code Releases Activity

tidy-up after testing

Browse source
This commit is contained in:
Elliott Stoneham 2016-07-28 14:13:07 +01:00
parent c551647340
commit aebcb9faa9
2 changed files with 588 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

33
core/database/migrate.go
View file

@ -73,27 +73,26 @@ func migrations(lastMigration string) (migrationsT, error) {
func (m migrationsT) migrate(tx *sqlx.Tx) error { func (m migrationsT) migrate(tx *sqlx.Tx) error {
for _, v := range m { for _, v := range m {
log.Info("Processing migration file: " + v) log.Info("Processing migration file: " + v)
buf, err := web.Asset(migrationsDir + "/" + v) buf, err := web.Asset(migrationsDir + "/" + v)
if err != nil { if err != nil {
return err return err
} }
//fmt.Println("DEBUG database.Migrate() ", v, ":\n", string(buf)) // TODO actually run the SQL
err = processSQLfile(tx, buf) err = processSQLfile(tx, buf)
if err != nil { if err != nil {
return err return err
} }
json := `{"database":"` + v + `"}` json := `{"database":"` + v + `"}`
sql := "INSERT INTO `config` (`key`,`config`) " + sql := "INSERT INTO `config` (`key`,`config`) " +
"VALUES ('META','" + json + "VALUES ('META','" + json +
"') ON DUPLICATE KEY UPDATE `config`='" + json + "';" "') ON DUPLICATE KEY UPDATE `config`='" + json + "';"
_, err = tx.Exec(sql) _, err = tx.Exec(sql) // add a record in the config file to say we have done the upgrade
if err != nil { if err != nil {
return err return err
} }
//fmt.Println("DEBUG insert 10s wait for testing")
//time.Sleep(10 * time.Second)
} }
return nil return nil
} }
@ -104,7 +103,8 @@ func lockDB() (bool, error) {
if err != nil { if err != nil {
return false, err return false, err
} }
time.Sleep(time.Duration(b[0]) * time.Duration(b[1]) * time.Millisecond / 10) // up to 6.5 secs wait wait := ((time.Duration(b[0]) << 8) | time.Duration(b[1])) * time.Millisecond / 10 // up to 6.5 secs wait
time.Sleep(wait)
tx, err := (*dbPtr).Beginx() tx, err := (*dbPtr).Beginx()
if err != nil { if err != nil {
@ -125,7 +125,7 @@ func lockDB() (bool, error) {
_, err = tx.Exec("INSERT INTO `config` (`key`,`config`) " + _, err = tx.Exec("INSERT INTO `config` (`key`,`config`) " +
fmt.Sprintf(`VALUES ('DBLOCK','{"pid": "%d"}');`, os.Getpid())) fmt.Sprintf(`VALUES ('DBLOCK','{"pid": "%d"}');`, os.Getpid()))
if err != nil { if err != nil {
// good error might be "Error 1062: Duplicate entry 'DBLOCK' for key 'idx_config_area'" // good error would be "Error 1062: Duplicate entry 'DBLOCK' for key 'idx_config_area'"
if strings.HasPrefix(err.Error(), "Error 1062:") { if strings.HasPrefix(err.Error(), "Error 1062:") {
log.Info("Database locked by annother Documize instance") log.Info("Database locked by annother Documize instance")
return false, nil return false, nil
@ -152,17 +152,18 @@ func unlockDB() error {
func migrateEnd(tx *sqlx.Tx, err error, amLeader bool) error { func migrateEnd(tx *sqlx.Tx, err error, amLeader bool) error {
if amLeader { if amLeader {
defer func() { log.IfErr(unlockDB()) }() defer func() { log.IfErr(unlockDB()) }()
} if tx != nil {
if tx != nil { if err == nil {
if err == nil { log.IfErr(tx.Commit())
log.IfErr(tx.Commit()) log.Info("Database checks: completed")
log.Info("Database checks: completed") return nil
return nil }
log.IfErr(tx.Rollback())
} }
log.IfErr(tx.Rollback()) log.Error("Database checks: failed: ", err)
return err
} }
log.Error("Database checks: failed: ", err) return nil // not the leader, so ignore errors
return err
} }
func getLastMigration(tx *sqlx.Tx) (lastMigration string, err error) { func getLastMigration(tx *sqlx.Tx) (lastMigration string, err error) {

1142
embed/bindata_assetfs.go
View file

File diff suppressed because one or more lines are too long