git://git.iain.cx/iain
/
pstop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f135d18
)
Fix brokenness with mixing strings and parameters
author
Simon J Mudd
<sjmudd@pobox.com>
Fri, 27 Feb 2015 15:27:05 +0000
(16:27 +0100)
committer
Simon J Mudd
<sjmudd@pobox.com>
Fri, 27 Feb 2015 15:27:05 +0000
(16:27 +0100)
p_s/setup_instruments/setup_instruments.go
patch
|
blob
|
history
diff --git
a/p_s/setup_instruments/setup_instruments.go
b/p_s/setup_instruments/setup_instruments.go
index
476b77b
..
237b0c6
100644
(file)
--- a/
p_s/setup_instruments/setup_instruments.go
+++ b/
p_s/setup_instruments/setup_instruments.go
@@
-53,10
+53,12
@@
func (si *SetupInstruments) EnableMonitoring() {
func (si *SetupInstruments) EnableStageMonitoring() {
lib.Logger.Println("EnableStageMonitoring")
sql_match := "stage/sql/%"
func (si *SetupInstruments) EnableStageMonitoring() {
lib.Logger.Println("EnableStageMonitoring")
sql_match := "stage/sql/%"
+ sql_select := "SELECT NAME, ENABLED, TIMED FROM setup_instruments WHERE NAME LIKE '" + sql_match + "' AND 'YES' NOT IN (enabled,timed)"
+
collecting := "Collecting setup_instruments stage/sql configuration settings"
updating := "Updating setup_instruments configuration for: stage/sql"
collecting := "Collecting setup_instruments stage/sql configuration settings"
updating := "Updating setup_instruments configuration for: stage/sql"
- si.Configure(sql_
match
, collecting, updating)
+ si.Configure(sql_
select
, collecting, updating)
lib.Logger.Println("EnableStageMonitoring finishes")
}
lib.Logger.Println("EnableStageMonitoring finishes")
}
@@
-64,10
+66,11
@@
func (si *SetupInstruments) EnableStageMonitoring() {
func (si *SetupInstruments) EnableMutexMonitoring() {
lib.Logger.Println("EnableMutexMonitoring")
sql_match := "wait/synch/mutex/%"
func (si *SetupInstruments) EnableMutexMonitoring() {
lib.Logger.Println("EnableMutexMonitoring")
sql_match := "wait/synch/mutex/%"
+ sql_select := "SELECT NAME, ENABLED, TIMED FROM setup_instruments WHERE NAME LIKE '" + sql_match + "' AND 'YES' NOT IN (enabled,timed)"
collecting := "Collecting setup_instruments wait/synch/mutex configuration settings"
updating := "Updating setup_instruments configuration for: wait/synch/mutex"
collecting := "Collecting setup_instruments wait/synch/mutex configuration settings"
updating := "Updating setup_instruments configuration for: wait/synch/mutex"
- si.Configure(sql_
match
, collecting, updating)
+ si.Configure(sql_
select
, collecting, updating)
lib.Logger.Println("EnableMutexMonitoring finishes")
}
lib.Logger.Println("EnableMutexMonitoring finishes")
}
@@
-88,8
+91,8
@@
func error_in_expected_list(actual_error string, expected_errors []string) bool
}
// generic routine (now) to update some rows in setup instruments
}
// generic routine (now) to update some rows in setup instruments
-func (si *SetupInstruments) Configure(sql_
match
string, collecting, updating string) {
- lib.Logger.Println(fmt.Sprintf("Configure(%q,%q,%q)", sql_
match
, collecting, updating))
+func (si *SetupInstruments) Configure(sql_
select
string, collecting, updating string) {
+ lib.Logger.Println(fmt.Sprintf("Configure(%q,%q,%q)", sql_
select
, collecting, updating))
// skip if we've tried and failed
if si.update_tried && !si.update_succeeded {
lib.Logger.Println("Configure() - Skipping further configuration")
// skip if we've tried and failed
if si.update_tried && !si.update_succeeded {
lib.Logger.Println("Configure() - Skipping further configuration")
@@
-103,8
+106,8
@@
func (si *SetupInstruments) Configure(sql_match string, collecting, updating str
lib.Logger.Println(collecting)
lib.Logger.Println(collecting)
- lib.Logger.Println("dbh.query", sql_select
, sql_match
)
- rows, err := si.dbh.Query(sql_select
, sql_match
)
+ lib.Logger.Println("dbh.query", sql_select)
+ rows, err := si.dbh.Query(sql_select)
if err != nil {
log.Fatal(err)
}
if err != nil {
log.Fatal(err)
}