Index: openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 11 Apr 2003 03:58:38 -0000 1.5
+++ openacs-4/packages/acs-bootstrap-installer/tcl/20-db-bootstrap-procs.tcl 29 Oct 2003 10:12:41 -0000 1.6
@@ -208,15 +208,15 @@
set long_error 0
foreach pool $pools {
if { [catch { set db [ns_db gethandle -timeout 15 $pool]}] || ![string compare $db ""] } {
- ns_log Notice "Couldn't allocate a handle from database pool \"$pool\"."
+ ns_log Warning "$proc_name: couldn't allocate a handle from database pool \"$pool\"."
lappend bad_pools "
OpenACS could not allocate a handle from database pool \"$pool\"."
set long_error 1
break
} else {
set this_suffix ""
if { [catch { set driver [ns_db dbtype $db] } errmsg] } {
set database_problem "RDBMS type could not be determined: $errmsg"
- ns_log Error "RDBMS type could not be determined: $errmsg"
+ ns_log Error "$proc_name: RDBMS type could not be determined: $errmsg"
} else {
foreach known_database_type [nsv_get ad_known_database_types .] {
if { ![string compare $driver [lindex $known_database_type 1]] } {
@@ -227,14 +227,14 @@
}
ns_db releasehandle $db
if { [string length $this_suffix] == 0 } {
- ns_log Notice "Couldn't determine RDBMS type of database pool \"$pool\"."
+ ns_log Notice "$proc_name: couldn't determine RDBMS type of database pool \"$pool\"."
lappend bad_pools "OpenACS could not determine the RDBMS type associated with
pool \"$pool\"."
set long_error 1
} elseif { [string length [nsv_get ad_database_type .]] == 0 } {
nsv_set ad_database_type . $this_suffix
} elseif { ![string match $this_suffix [nsv_get ad_database_type .]] } {
- ns_log Notice "Database pool \"$pool\" type \"$this_suffix\" differs from
+ ns_log Notice "$proc_name: Database pool \"$pool\" type \"$this_suffix\" differs from
\"[nsv_get ad_database_type .]\"."
lappend bad_pools "Database pool \"$pool\" is of type \"$this_suffix\". The
first database pool available to OpenACS was of type \"[nsv_get ad_database_type .]\". All database
@@ -245,7 +245,7 @@
if { [string length [nsv_get ad_database_type .]] == 0 } {
set database_problem "RDBMS type could not be determined for any pool."
- ns_log Error "RDBMS type could not be determined for any pool."
+ ns_log Error "$proc_name: RDBMS type could not be determined for any pool."
}
if { [llength $bad_pools] > 0 } {