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:
eb20c89
)
setup_instruments: use query with parameter
author
Simon J Mudd
<sjmudd@pobox.com>
Tue, 24 Feb 2015 08:48:19 +0000
(09:48 +0100)
committer
Simon J Mudd
<sjmudd@pobox.com>
Tue, 24 Feb 2015 08:48:19 +0000
(09:48 +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
3475be4
..
3bfb9fd
100644
(file)
--- a/
p_s/setup_instruments/setup_instruments.go
+++ b/
p_s/setup_instruments/setup_instruments.go
@@
-9,6
+9,9
@@
import (
"github.com/sjmudd/pstop/lib"
)
"github.com/sjmudd/pstop/lib"
)
+// constants
+const sql_select = "SELECT NAME, ENABLED, TIMED FROM setup_instruments WHERE NAME LIKE ? AND 'YES NOT IN (enabled,timed)"
+
// We only match on the error number
// Error 1142: UPDATE command denied to user 'cacti'@'10.164.132.182' for table 'setup_instruments'
// Error 1290: The MySQL server is running with the --read-only option so it cannot execute this statement
// We only match on the error number
// Error 1142: UPDATE command denied to user 'cacti'@'10.164.132.182' for table 'setup_instruments'
// Error 1290: The MySQL server is running with the --read-only option so it cannot execute this statement
@@
-49,22
+52,22
@@
func (si *SetupInstruments) EnableMonitoring() {
// Change settings to monitor stage/sql/%
func (si *SetupInstruments) EnableStageMonitoring() {
lib.Logger.Println("EnableStageMonitoring")
// Change settings to monitor stage/sql/%
func (si *SetupInstruments) EnableStageMonitoring() {
lib.Logger.Println("EnableStageMonitoring")
- sql
:= "SELECT NAME, ENABLED, TIMED FROM setup_instruments WHERE NAME LIKE 'stage/sql/%' AND ( enabled <> 'YES' OR timed <> 'YES' )
"
+ sql
_match := "stage/sql/%
"
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, collecting, updating)
+ si.Configure(sql
_match
, collecting, updating)
lib.Logger.Println("EnableStageMonitoring finishes")
}
// Change settings to monitor wait/synch/mutex/%
func (si *SetupInstruments) EnableMutexMonitoring() {
lib.Logger.Println("EnableMutexMonitoring")
lib.Logger.Println("EnableStageMonitoring finishes")
}
// Change settings to monitor wait/synch/mutex/%
func (si *SetupInstruments) EnableMutexMonitoring() {
lib.Logger.Println("EnableMutexMonitoring")
- sql
:= "SELECT NAME, ENABLED, TIMED FROM setup_instruments WHERE NAME LIKE 'wait/synch/mutex/%' AND ( enabled <> 'YES' OR timed <> 'YES' )
"
+ sql
_match := "wait/synch/mutex/%
"
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, collecting, updating)
+ si.Configure(sql
_match
, collecting, updating)
lib.Logger.Println("EnableMutexMonitoring finishes")
}
lib.Logger.Println("EnableMutexMonitoring finishes")
}
@@
-85,8
+88,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(s
elect_sql
string, collecting, updating string) {
- lib.Logger.Println(fmt.Sprintf("Configure(%q,%q,%q)", s
elect_sql
, collecting, updating))
+func (si *SetupInstruments) Configure(s
ql_match
string, collecting, updating string) {
+ lib.Logger.Println(fmt.Sprintf("Configure(%q,%q,%q)", s
ql_match
, 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")
@@
-100,8
+103,8
@@
func (si *SetupInstruments) Configure(select_sql string, collecting, updating st
lib.Logger.Println(collecting)
lib.Logger.Println(collecting)
- lib.Logger.Println("dbh.query", s
elect_sql
)
- rows, err := si.dbh.Query(s
elect_sql
)
+ lib.Logger.Println("dbh.query", s
ql_select, sql_match
)
+ rows, err := si.dbh.Query(s
ql_select, sql_match
)
if err != nil {
log.Fatal(err)
}
if err != nil {
log.Fatal(err)
}