Skip to content

Commit 596fb16

Browse files
committed
fix: use multiline regex for ERROR line matching in ts/commands.go
1 parent 2254f02 commit 596fb16

2 files changed

Lines changed: 21 additions & 5 deletions

File tree

mkreadme/readme_template.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1-
[DBdeployer](https://github.com/datacharmer/dbdeployer) is a tool that deploys MySQL database servers easily.
2-
This is a port of [MySQL-Sandbox](https://github.com/datacharmer/mysql-sandbox), originally written in Perl, and re-designed from the ground up in [Go](https://golang.org). See the [features comparison](https://github.com/datacharmer/dbdeployer/blob/master/docs/features.md) for more detail.
1+
[DBdeployer](https://github.com/ProxySQL/dbdeployer) is a tool that deploys MySQL database servers easily.
2+
This is a port of [MySQL-Sandbox](https://github.com/datacharmer/mysql-sandbox), originally written in Perl, and re-designed from the ground up in [Go](https://golang.org). See the [features comparison](https://github.com/ProxySQL/dbdeployer/blob/master/docs/features.md) for more detail.
3+
4+
## New Maintainer
5+
6+
As of 2026, dbdeployer is actively maintained by the [ProxySQL](https://github.com/ProxySQL) team, with the blessing of the original creator [Giuseppe Maxia](https://github.com/datacharmer). We are grateful for Giuseppe's years of work on this project.
7+
8+
**Roadmap:**
9+
- Modern MySQL support (8.4 LTS, 9.x Innovation releases)
10+
- ProxySQL and Orchestrator integration as deployment providers
11+
- Provider-based architecture for extensibility
12+
- PostgreSQL support (long-term)
13+
14+
See the [Phase 1 milestone](https://github.com/ProxySQL/dbdeployer/milestone/1) for current progress.
315

416
Documentation updated for version {{.Version}} ({{.Date}})
517

6-
![Build Status](https://github.com/datacharmer/dbdeployer/workflows/.github/workflows/all_tests.yml/badge.svg)
18+
![Build Status](https://github.com/ProxySQL/dbdeployer/workflows/.github/workflows/all_tests.yml/badge.svg)
719

820
# Table of contents
921

ts/commands.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,13 @@ func findErrorsInLogFile(ts *testscript.TestScript, neg bool, args []string) {
6060
ts.Check(err)
6161
hasError := strings.Contains(string(contents), "ERROR")
6262
if neg && hasError {
63-
reLines := regexp.MustCompile(`(?s)(^.*ERROR.*)`)
63+
reLines := regexp.MustCompile(`(?m)(^.*ERROR.*$)`)
6464
errorLines := reLines.FindAll(contents, -1)
65-
ts.Fatalf("ERRORs found in %s (%s)\n", logFile, errorLines)
65+
var lines []string
66+
for _, line := range errorLines {
67+
lines = append(lines, string(line))
68+
}
69+
ts.Fatalf("ERRORs found in %s (%s)\n", logFile, strings.Join(lines, "\n"))
6670
}
6771
if !neg && !hasError {
6872
ts.Fatalf("ERRORs not found in %s\n", logFile)

0 commit comments

Comments
 (0)