Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v diff -u -r1.55 -r1.56 --- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 17 Oct 2003 08:41:50 -0000 1.55 +++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl 1 Nov 2003 08:45:36 -0000 1.56 @@ -181,7 +181,7 @@ set result(auth_status) failed_to_connect set result(auth_message) $errmsg global errorInfo - ns_log Error "Error invoking authentication driver for authority_id = $authority_id: $errorInfo" + ns_log Error "auth::authenticate: error invoking authentication driver for authority_id = $authority_id: $errorInfo" } # Returns: @@ -211,7 +211,7 @@ return [array get result] } default { - ns_log Error "Illegal auth_status code '$result(auth_status)' returned from authentication driver for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])" + ns_log Error "auth::authenticate: Illegal auth_status code '$result(auth_status)' returned from authentication driver for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])" set result(auth_status) "failed_to_connect" set result(auth_message) "Internal error during authentication" @@ -233,7 +233,7 @@ } } default { - ns_log Error "Illegal account_status code '$result(account_status)' returned from authentication driver for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])" + ns_log Error "auth::authenticate: Illegal account_status code '$result(account_status)' returned from authentication driver for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])" set result(account_status) "closed" set result(account_message) "Internal error during authentication" @@ -275,7 +275,7 @@ } } default { - ns_log Error "Illegal account_status code '$result(account_status)' returned from auth::get_local_account for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])" + ns_log Error "auth::authenticate: Illegal account_status code '$result(account_status)' returned from auth::get_local_account for authority_id $authority_id ([auth::authority::get_element -authority_id $authority_id -element pretty_name])" set result(account_status) "closed" set result(account_message) "Internal error during authentication" @@ -336,12 +336,12 @@ auth::authority::get -authority_id $authority_id -array authority if { [empty_string_p $authority(register_impl_id)] } { - ns_log Error "parameter value for RegisterAuthority is an authority without registration driver, defaulting to local authority" + ns_log Error "auth::get_register_authority: parameter value for RegisterAuthority is an authority without registration driver, defaulting to local authority" set authority_id [auth::authority::local] } } else { # The authority doesn't exist - use the local authority - ns_log Error "parameter RegisterAuthority has the invalid value $parameter_value. Defaulting to local authority" + ns_log Error "auth::get_register_authority: parameter RegisterAuthority has the invalid value $parameter_value. Defaulting to local authority" set authority_id [auth::authority::local] } @@ -535,7 +535,7 @@ set creation_info(creation_status) failed_to_connect set creation_info(creation_message) $errmsg global errorInfo - ns_log Error "Error invoking account registration driver for authority_id = $authority_id: $errorInfo" + ns_log Error "auth::create_user: Error invoking account registration driver for authority_id = $authority_id: $errorInfo" db_abort_transaction } @@ -862,7 +862,7 @@ } } set username "$username-$number" - ns_log Notice "User's email was already used as someone else's username, setting username to $username" + ns_log Notice "auth::create_local_account: user's email was already used as someone else's username, setting username to $username" } } @@ -899,7 +899,7 @@ set result(creation_status) "failed_to_connect" set result(creation_message) "We experienced an error while trying to register an account for you." global errorInfo - ns_log Error "Error creating local account.\n$errorInfo" + ns_log Error "auth::create_local_account: Error creating local account.\n$errorInfo" return [array get result] } @@ -922,7 +922,7 @@ auth::send_email_verification_email -user_id $user_id } { global errorInfo - ns_log Error "auth::get_local_account: Error sending out email verification email to email $email:\n$errorInfo" + ns_log Error "auth::create_local_account: Error sending out email verification email to email $email:\n$errorInfo" set auth_info(account_message) "We got an error sending out the email for email verification" } } @@ -1251,7 +1251,7 @@ auth::send_email_verification_email -user_id $user_id } { global errorInfo - ns_log Error "auth::get_local_account: Error sending out email verification email to email $email:\n$errorInfo" + ns_log Error "auth::check_local_account_status: Error sending out email verification email to email $email:\n$errorInfo" set result(account_message) "We got an error sending out the email for email verification" } } @@ -1281,7 +1281,7 @@ default { set result(account_message) \ "There was a problem authenticating the account. Most likely, the database contains users with no member_state." - ns_log Error "Problem with registration state machine: user_id $user_id has member_state '$member_state'" + ns_log Error "auth::check_local_account_status: problem with registration state machine: user_id $user_id has member_state '$member_state'" } } Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 26 Sep 2003 07:45:38 -0000 1.19 +++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl 1 Nov 2003 08:45:36 -0000 1.20 @@ -321,7 +321,7 @@ foreach category $cats { if {[string trim $category] != ""} { if {[lsearch [nsv_get aa_test categories] $category] == -1} { - ns_log warning "acs-automated-testing: Unknown testcase category $category" + ns_log warning "aa_register_case: Unknown testcase category $category" } lappend filtered_cats $category } @@ -342,7 +342,7 @@ } } if {!$found} { - ns_log warning "acs-automated-testing: Unknown init class $init_class" + ns_log warning " aa_register_case: Unknown init class $init_class" } else { lappend filtered_inits $init_class } @@ -573,7 +573,7 @@ where testcase_id = :testcase_id" db_dml delete_testcase_final_results $sql - ns_log notice "Running testcase $testcase_id" + ns_log debug "aa_run_testcase: Running testcase $testcase_id" set catch_val [catch _${package_key}__$testcase_id msg] if {$catch_val} { @@ -731,13 +731,13 @@ incr aa_testcase_test_id if {$test_result == "pass"} { - ns_log Debug "PASSED: $aa_testcase_id, $test_notes" + ns_log Debug "aa_log_result: PASSED: $aa_testcase_id, $test_notes" incr aa_testcase_passes } elseif {$test_result == "fail"} { - ns_log Error "FAILED: $aa_testcase_id, $test_notes" + ns_log Error "aa_log_result: FAILED: $aa_testcase_id, $test_notes" incr aa_testcase_fails } else { - ns_log Debug "LOG: $aa_testcase_id, $test_notes" + ns_log Debug "aa_log_result: LOG: $aa_testcase_id, $test_notes" set test_result "log" } # Notes in database can only hold so many characters @@ -762,7 +762,7 @@ if {$test_fails == 0} { } else { - ns_log Error "FAILED: $aa_testcase_id, $test_fails tests failed" + ns_log Error "aa_log_final: FAILED: $aa_testcase_id, $test_fails tests failed" } db_dml testcase_result_insert { Index: openacs-4/packages/acs-automated-testing/tcl/example-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/example-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-automated-testing/tcl/example-procs.tcl 11 Nov 2001 18:03:52 -0000 1.1 +++ openacs-4/packages/acs-automated-testing/tcl/example-procs.tcl 1 Nov 2003 08:45:36 -0000 1.2 @@ -22,7 +22,7 @@ @author Peter Harper @creation-date 24 July 2001 } { - ns_log notice "Auditing: $name, $value" + ns_log debug "aa_example_write_audit_entry: Auditing: $name, $value" return 1 } Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 7 Jul 2003 12:25:53 -0000 1.13 +++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 1 Nov 2003 08:45:36 -0000 1.14 @@ -68,23 +68,23 @@ variable revision_id if { [template::util::is_nil item_id] } { - ns_log notice "No active item in content::get_content" + ns_log warning "content::get_content: No active item in content::get_content" return } # Get the live revision set revision_id [db_string get_revision ""] if { [template::util::is_nil revision_id] } { - ns_log notice "No live revision for item $item_id" + ns_log notice "content::get_content: No live revision for item $item_id" return } # Get the mime type, decide if we want the text set mime_type [db_string get_mime_type ""] if { [template::util::is_nil mime_type] } { - ns_log notice "No such revision: $reivision_id" + ns_log notice "content::get_content: No such revision: $revision_id" return } @@ -106,7 +106,7 @@ # Get (all) the content (note this is really dependent on file type) if {![db_0or1row get_content "" -column_array content]} { - ns_log Notice "No data found for item $item_id, revision $revision_id" + ns_log notice "content::get_content: No data found for item $item_id, revision $revision_id" return 0 } @@ -174,7 +174,7 @@ db_0or1row get_template_info "" -column_array item_info if { ![info exists item_info] } { - ns_log Notice "No content found for url $url" + ns_log notice "content::init: no content found for url $url" return 0 } } @@ -192,7 +192,7 @@ set live_revision [db_string get_live_revision ""] if { [template::util::is_nil live_revision] } { - ns_log Notice "No live revision found for content item $item_id" + ns_log notice "content::init: no live revision found for content item $item_id" return 0 } set revision_id $live_revision @@ -206,7 +206,7 @@ db_1row get_template_url "" -column_array info if { [string equal $info(template_url) {}] } { - ns_log Notice "No template found to render content item $item_id in context '$context'" + ns_log notice "content::init: No template found to render content item $item_id in context '$context'" return 0 } Index: openacs-4/packages/acs-content-repository/tcl/item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/item-procs.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/acs-content-repository/tcl/item-procs.tcl 24 Oct 2003 16:03:33 -0000 1.14 +++ openacs-4/packages/acs-content-repository/tcl/item-procs.tcl 1 Nov 2003 08:45:36 -0000 1.15 @@ -114,7 +114,7 @@ set item_id [get_item_from_revision $revision_id] if { [template::util::is_nil item_id] } { - ns_log notice "No such revision: $reivision_id" + ns_log warning "item::get_revision_content: No such revision: $reivision_id" return 0 } } else { @@ -143,7 +143,7 @@ db_0or1row grc_get_all_content "" -column_array content if { ![array exists content] } { - ns_log Notice "No data found for item $item_id, revision $revision_id" + ns_log warning "item::get_revision_content: No data found for item $item_id, revision $revision_id" return 0 } @@ -407,7 +407,7 @@ set live_revision [db_string glr_get_live_revision ""] if { [template::util::is_nil live_revision] } { - ns_log notice "WARNING: No live revision for item $item_id" + ns_log warning "item::get_live_revision: No live revision for item $item_id" return "" } else { return $live_revision @@ -491,7 +491,7 @@ set item_url [get_url $item_id] if { [template::util::is_nil item_url] } { - ns_log notice "WARNING: No item URL found for content item $item_id" + ns_log warning "item::get_extended_url: No item URL found for content item $item_id" return "" } @@ -529,7 +529,7 @@ set revision_id [get_live_revision $item_id] if { [template::util::is_nil revision_id] } { - ns_log notice "WARNING: No live revision for content item $item_id" + ns_log warning "item::get_best_revision: No live revision for content item $item_id" return "" } @@ -651,7 +651,7 @@ if { [empty_string_p $item_id] } { set item_id [get_item_from_revision $revision_id] if { [empty_string_p $item_id] } { - ns_log notice "No such revision: $reivision_id" + ns_log notice "item::get_content: no such revision: $reivision_id" return 0 } } Index: openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 16 Sep 2002 10:56:15 -0000 1.4 +++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 1 Nov 2003 08:45:36 -0000 1.5 @@ -300,7 +300,7 @@ # If an error happened, abort if { ![template::util::is_nil error_msg] } { - ns_log notice "WARNING: $error_msg" + ns_log Warning "publish::handle::image: WARNING: $error_msg" return "" } @@ -381,11 +381,11 @@ set ::content::template_url [item::get_template_url $item_id] if { [string equal $::content::template_url {}] } { - ns_log notice "MERGE: No template for item $item_id" + ns_log Warning "publish::merge_with_template: no template for item $item_id" return "" } - ns_log notice "MERGE: Template for item $item_id is $::content::template_url" + ns_log debug "publish::merge_with_template: template for item $item_id is $::content::template_url" # Get the full path to the template set root_path [content::get_template_root] @@ -400,7 +400,7 @@ # Parse the template and return the result publish::push_id $item_id $revision_id - ns_log notice "MERGE: Parsing $file_stub" + ns_log debug "publish::merge_with_template: parsing $file_stub" set html [eval "template::adp_parse \"$file_stub\" \[list $adp_args\]"] publish::pop_id @@ -612,7 +612,7 @@ } if { [template::util::is_nil revision_id] } { - ns_log notice "HANDLER: No live revision for $item_id" + ns_log warning "publish::handle_item: No live revision for $item_id" return "" } @@ -632,18 +632,18 @@ if { ![info exists opts(refresh)] && \ [info exists revision_html($revision_key)] } { - ns_log notice "HANDLER: Fetching $item_id from cache" + ns_log debug "publish::handle_item: Fetching $item_id from cache" return $revision_html($revision_key) } else { # Render the item and cache it - ns_log notice "HANDLER: Rendering item $item_id" + ns_log debug "publish::handle_item: Rendering item $item_id" item::get_mime_info $revision_id mime_info set item_handler [get_mime_handler $mime_info(mime_type)] if { [template::util::is_nil item_handler] } { - ns_log notice "HANDLER: No mime handler for mime type $mime_info(mime_type)" + ns_log warning "publish::handle_item: No mime handler for mime type $mime_info(mime_type)" return "" } @@ -657,7 +657,7 @@ } set html [eval $code] - ns_log notice "HANDLER: Caching html for revision $revision_id" + ns_log debug "publish::handle_item: Caching html for revision $revision_id" set revision_html($revision_key) $html return $html @@ -857,7 +857,7 @@ upvar current_page_root current_page_root foreach root_path $paths { - ns_log Notice "FOREACH_PUBLISH_PATH: root_path: $root_path" + ns_log debug "publish::foreach_publish_path: root_path: $root_path" set current_page_root $root_path set filename [ns_normalizepath "/$root_path/$url"] uplevel $code @@ -895,7 +895,7 @@ " -file $filename ns_chmod $filename 0764 - ns_log notice "PUBLISH: Wrote revision $revision_id to $filename" + ns_log debug "publish::write_multiple_blobs: Wrote revision $revision_id to $filename" } $root_path } @@ -914,12 +914,12 @@ @see publish::write_multiple_blobs } { - ns_log Notice "WRITE_MULTIPLE_FILES: root_path = $root_path" + ns_log debug "publish::write_multiple_files: root_path = $root_path" foreach_publish_path $url { mkdirs $filename template::util::write_file $filename $text ns_chmod $filename 0764 - ns_log notice "PUBLISH: Wrote text to $filename" + ns_log debug "publish::write_multiple_files: Wrote text to $filename" } $root_path } @@ -975,8 +975,7 @@ set item_id [db_string get_one_revision ""] if { [template::util::is_nil item_id] } { - ns_log notice \ - "WARNING: publish::write_content: No such revision $revision_id" + ns_log warning "publish::write_content: No such revision $revision_id" return "" } } else { @@ -987,7 +986,7 @@ set file_url [item::get_extended_url $item_id -revision_id $revision_id] # Write blob/text to file - ns_log notice "Writing item $item_id to $file_url" + ns_log debug " publish::write_content: writing item $item_id to $file_url" if { [info exists opts(text)] } { db_transaction { @@ -1008,8 +1007,7 @@ # Determine if the blob is null. If it is, give up (or else the # ns_ora blob_get_file will crash). if { [item::content_is_null $revision_id] } { - ns_log notice \ - "WARNING: publish::write_content: No content supplied for revision $revision_id" + ns_log warning "publish::write_content: No content supplied for revision $revision_id" return "" } Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v diff -u -r1.39 -r1.40 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 22 Sep 2003 19:44:28 -0000 1.39 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 1 Nov 2003 08:45:36 -0000 1.40 @@ -225,7 +225,7 @@ for {set hour $start_hour} {$hour <= $end_hour} {incr hour} { if {$max_n_events < $n_events($hour)} { set max_n_events $n_events($hour) - ns_log Notice "BMA-DEBUG-CAL: Setting max_n_events to $max_n_events" + ns_log debug "BMA-DEBUG-CAL: Setting max_n_events to $max_n_events" } } Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 28 Oct 2003 10:56:16 -0000 1.17 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 1 Nov 2003 08:45:36 -0000 1.18 @@ -386,7 +386,7 @@ @author Lars Pind (lars@pinds.com) @creation-date 31 August 2000 } { - ns_log Warning "Developer-support user-switching [ad_decode $enabled_p 1 "enabled" "disabled"]" + ns_log Notice "Developer-support user-switching [ad_decode $enabled_p 1 "enabled" "disabled"]" nsv_set ds_properties user_switching_enabled_p $enabled_p } @@ -396,7 +396,7 @@ @author Lars Pind (lars@pinds.com) @creation-date 31 August 2000 } { - ns_log Warning "Developer-support database stats [ad_decode $enabled_p 1 "enabled" "disabled"]" + ns_log Notice "Developer-support database stats [ad_decode $enabled_p 1 "enabled" "disabled"]" nsv_set ds_properties database_enabled_p $enabled_p } Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 29 Oct 2003 13:40:15 -0000 1.35 +++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 1 Nov 2003 08:45:36 -0000 1.36 @@ -49,7 +49,7 @@ #set default_charset [encoding system] # LARS: Default to utf-8 set default_charset utf-8 - ns_log Warning "charset $charset not supported by tcl, assuming $default_charset" + ns_log Warning "lang::catalog::default_charset_if_unsupported: charset $charset not supported by tcl, assuming $default_charset" set charset_to_use $default_charset } else { set charset_to_use $charset @@ -111,7 +111,7 @@ set return_value 1 } else { # Catalog file with unknown prefix - ns_log Warning "The file $file_path has unknown prefix $prefix" + ns_log Warning "lang::catalog::is_upgrade_backup_file: The file $file_path has unknown prefix $prefix" set return_value 0 } } @@ -278,7 +278,7 @@ # Create the catalog directory if it doesn't exist set catalog_dir [package_catalog_dir $filename_info(package_key)] if { ![file isdirectory $catalog_dir] } { - ns_log Notice "Creating new catalog directory $catalog_dir" + ns_log Notice "lang::catalog::export_to_file: Creating new catalog directory $catalog_dir" file mkdir $catalog_dir } @@ -288,7 +288,7 @@ ns_log Notice "Backing up catalog file $file_path" file copy -- $file_path $backup_path } else { - ns_log Notice "Not backing up $file_path as backup file already exists" + ns_log Notice "lang::catalog::export_to_file: Not backing up $file_path as backup file already exists" } # Since the output charset, and thus the filename, may have changed since @@ -328,7 +328,7 @@ puts $catalog_file_id "" close $catalog_file_id - ns_log Notice "Wrote $message_count messages to file $file_path with encoding $file_encoding" + ns_log Notice "lang::catalog::export_to_file: Wrote $message_count messages to file $file_path with encoding $file_encoding" } ad_proc -public lang::catalog::export { @@ -398,13 +398,13 @@ @author Peter Marklund (peter@collaboraid.biz) } { if {![regexp {/([^/]*)\.([^/]*)\.(?:xml|cat)$} $catalog_filename match base msg_encoding]} { - ns_log Warning "Charset info missing in filename assuming $catalog_filename is iso-8859-1" + ns_log Warning "lang::catalog::read_file: Charset info missing in filename assuming $catalog_filename is iso-8859-1" set msg_encoding iso-8859-1 - } + } set msg_encoding [default_charset_if_unsupported $msg_encoding] - ns_log Notice "reading $catalog_filename in $msg_encoding" + ns_log Notice "lang::catalog::read_file: reading $catalog_filename in $msg_encoding" set in [open $catalog_filename] fconfigure $in -encoding [ns_encodingforcharset $msg_encoding] set catalog_file_contents [read $in] @@ -557,7 +557,7 @@ # want that to trigger an upgrade. set upgrade_p [ad_decode $higher_version_p 1 1 0] } - ns_log Notice "Loading messages in file $file_path [ad_decode $upgrade_p 0 "" ", upgrading"]" + ns_log Notice "lang::catalog::import_from_file: Loading messages in file $file_path [ad_decode $upgrade_p 0 "" ", upgrading"]" # Get the messages array, and the list of message keys to iterate over array set messages_array [lindex [array get catalog_array messages] 1] @@ -576,7 +576,7 @@ template::util::multirow_foreach all_messages { set message_key @all_messages.message_key@ if { [lsearch -exact $messages_array_names $message_key] < 0 } { - ns_log Notice "Marking message $message_key in locale $locale as deleted" + ns_log Notice "lang::catalog::import_from_file: Marking message $message_key in locale $locale as deleted" db_dml mark_message_as_deleted {} # One approach to deleted message keys after upgrade is to consider those @@ -639,7 +639,7 @@ set system_package_version [system_package_version_name $package_key] # Note that export_messages_to_file demands a certain filename format - ns_log Notice "Saving overwritten messages during upgrade for package $package_key and locale $locale in file $filename" + ns_log Notice "lang::catalog::import_from_file: Saving overwritten messages during upgrade for package $package_key and locale $locale in file $filename" set file_path [get_catalog_file_path \ -backup_from_version ${system_package_version} \ -backup_to_version $catalog_array(package_version) \ @@ -693,7 +693,7 @@ # Issue a warning and exit if there are no catalog files if { [empty_string_p $catalog_files] } { - ns_log Warning "No catalog files found for package $package_key" + ns_log Warning "lang::catalog::import: No catalog files found for package $package_key" continue } @@ -702,7 +702,7 @@ if { [catch {import_from_file $file_path} errMsg] } { global errorInfo - ns_log Error "The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n" + ns_log Error "lang::catalog::import: The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n" } } } @@ -756,7 +756,7 @@ if { [file exists $file_path] } { lappend catalog_files $file_path } else { - ns_log Error "Catalog file $file_path not found. Failed to import messages for package $package_key and locale $locale" + ns_log Error "lang::catalog::get_catalog_paths_for_import: Catalog file $file_path not found. Failed to import messages for package $package_key and locale $locale" } } @@ -788,7 +788,7 @@ if [catch { set translated_message [lang_babel_translate $message en_$lang] } errmsg] { - ns_log Notice "Error translating $message into $lang: $errmsg" + ns_log Notice "lang::catalog::translate: Error translating $message into $lang: $errmsg" } else { lang::message::register $lang $package_key $message_key $translated_message } Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 28 Oct 2003 12:25:46 -0000 1.35 +++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 1 Nov 2003 08:45:36 -0000 1.36 @@ -509,8 +509,6 @@ if { ![nsv_exists lang_message_cache executed_p] } { nsv_set lang_message_cache executed_p 1 - ns_log Notice "lang::message::cache - Initializing message cache ..." - if { [empty_string_p $package_key] } { set package_where_clause "" } else { Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v diff -u -r1.27 -r1.28 --- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 16 Oct 2003 10:50:12 -0000 1.27 +++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 1 Nov 2003 08:45:36 -0000 1.28 @@ -144,15 +144,14 @@ } { # Return if there are no files to process if { [llength $file_list] == 0 } { - ns_log Warning "lang::util::replace_temporary_tags_with_lookups - \ - Invoked with no files to process, returning" + ns_log Warning "lang::util::replace_temporary_tags_with_lookups: Invoked with no files to process, returning" return } # Get package_key set first_file [lindex $file_list 0] if { ![regexp {/?packages/([^/]+)/} $first_file match package_key] } { - error "lang::util::replace_temporary_tags_with_lookups - Could not extract package_key from file $first_file" + error "lang::util::replace_temporary_tags_with_lookups: Could not extract package_key from file $first_file" } # Always create new keys in en_US @@ -175,14 +174,14 @@ # Loop over and process each file foreach file $file_list { - ns_log Notice "lang::util::replace_temporary_tags_with_lookups - processing file $file" + ns_log debug "lang::util::replace_temporary_tags_with_lookups: processing file $file" set full_file_path "[acs_root_dir]/$file" regexp {\.([^.]+)$} $file match file_ending # Attempt a backup of the file first. Do not overwrite an old backup file. if { [catch "file -- copy $full_file_path \"${full_file_path}.orig\"" errmsg] } { - ns_log Warning [list lang::util::replace_temporary_tags_with_lookups - The file $full_file_path \ + ns_log Warning [list lang::util::replace_temporary_tags_with_lookups: The file $full_file_path could not be backed up before message key extraction since backup file \ ${full_file_path}.orig already exists] } @@ -252,7 +251,8 @@ if { ![string equal $message_key $unique_key] } { # The message key had to be changed to be made unique - ns_log Warning [list The message key $message_key was changed to $unique_key \ + ns_log Warning [list lang::util::replace_temporary_tags_with_lookups - \ + The message key $message_key was changed to $unique_key \ to be made unique. If the value was mistyped and should have been \ the same as previously then you must manually remove the entry for \ $unique_key from the catalog file and change the key in \ Index: openacs-4/packages/acs-lang/tcl/localization-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/localization-procs.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 12 Oct 2003 06:57:10 -0000 1.13 +++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 1 Nov 2003 08:45:37 -0000 1.14 @@ -190,7 +190,7 @@ # Fall back on en_US if grouping is not on valid format if { ![string equal $locale en_US] && ![regexp {^[0-9 ]+$} $grouping] } { - ns_log Error "acs-lang.localization-grouping key has invalid value $grouping for locale $locale" + ns_log Warning "lc_numeric: acs-lang.localization-grouping key has invalid value $grouping for locale $locale" return [lc_numeric $num $fmt en_US] } @@ -219,7 +219,7 @@ set row_returned [db_0or1row lc_currency_select {}] if { !$row_returned } { - ns_log Notice "Unsupported monetary currency, defaulting digits to 2" + ns_log Warning "lc_monetary_currency: Unsupported monetary currency, defaulting digits to 2" set fractional_digits 2 set html_entity "" } @@ -562,12 +562,12 @@ set local_time [db_exec_plsql utc_to_local {}] } errmsg] } { - ns_log Warning "Query exploded on time conversion from UTC, probably just an invalid date, $time_value: $errmsg" + ns_log Warning "lc_time_utc_to_local: Query exploded on time conversion from UTC, probably just an invalid date, $time_value: $errmsg" } if {[empty_string_p $local_time]} { # If no conversion possible, log it and assume local is as given (i.e. UTC) - ns_log Notice "Timezone adjustment in ad_localization.tcl found no conversion to UTC for $time_value $tz" + ns_log Notice "lc_time_utc_to_local: Timezone adjustment in ad_localization.tcl found no conversion to UTC for $time_value $tz" } return $local_time @@ -592,12 +592,12 @@ set utc_time [db_exec_plsql local_to_utc {}] } errmsg] } { - ns_log Warning "Query exploded on time conversion to UTC, probably just an invalid date, $time_value: $errmsg" + ns_log Warning "lc_time_local_to_utc: Query exploded on time conversion to UTC, probably just an invalid date, $time_value: $errmsg" } if {[empty_string_p $utc_time]} { # If no conversion possible, log it and assume local is as given (i.e. UTC) - ns_log Notice "Timezone adjustment in ad_localization.tcl found no conversion to local time for $time_value $tz" + ns_log Notice "lc_time_local_to_utc: Timezone adjustment in ad_localization.tcl found no conversion to local time for $time_value $tz" } return $utc_time @@ -666,7 +666,7 @@ with_catch errmsg { set time_value [db_exec_plsql convert {}] } { - ns_log Warning "Error converting timezone: $errmsg" + ns_log Warning "lc_time_tz_convert: Error converting timezone: $errmsg" } return $time_value } Index: openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/acs-ldap-authentication/tcl/ldap-procs.tcl 1 Nov 2003 08:45:37 -0000 1.2 @@ -56,7 +56,7 @@ exactly one entry that matches, then it returns the DN of that entry. Otherwise it returns the empty string. } { - ns_log debug "LDAP_GET_DN_FROM_EMAIL $email" + ns_log debug "ldap_get_dn_from_email: $email" # Set the LDAP environment variables util_unlist [ldap_set_environment] url rootdn rootpw basedn security_method @@ -75,7 +75,7 @@ if ![ldap_valid_value_p $dn] { # There was a problem with the query - ns_log Notice "ldap_get_dn_from_email: $dn" + ns_log Notice "ldap_get_dn_from_email: invalid value $dn" return "" } @@ -357,7 +357,7 @@ (:object_id, :dn) } } errmsg] { - ns_log warning "Failed on insert into ldap_attributes for object $object_id with dn $dn: $errmsg" + ns_log warning "ldap_set_environment: Failed on insert into ldap_attributes for object $object_id with dn $dn: $errmsg" return 0 } Index: openacs-4/packages/acs-mail/tcl/acs-mail-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/tcl/acs-mail-init.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-mail/tcl/acs-mail-init.tcl 25 Oct 2001 23:49:20 -0000 1.2 +++ openacs-4/packages/acs-mail/tcl/acs-mail-init.tcl 1 Nov 2003 08:45:37 -0000 1.3 @@ -34,10 +34,10 @@ if { [string equal $encoded_content $expected_result] } { nsv_set acs_mail ns_uuencode_works_p 1 - ns_log Notice "acs-mail: ns_uuencode works!!" + ns_log debug "acs-mail: ns_uuencode works!!" } else { nsv_set acs_mail ns_uuencode_works_p 0 - ns_log Notice "acs-mail: ns_uuencode broken - will use the slow tcl version" + ns_log Warning "acs-mail: ns_uuencode broken - will use the slow tcl version" } } Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 16 Oct 2003 23:06:29 -0000 1.16 +++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl 1 Nov 2003 08:45:37 -0000 1.17 @@ -101,7 +101,7 @@ if {!${party_id}} { ad_maybe_redirect_for_registration } else { - ns_log notice "$party_id doesn't have $privilege on object $object_id" + ns_log notice "permission::require_permission: $party_id doesn't have $privilege on object $object_id" ad_return_forbidden \ "Permission Denied" \ "
Index: openacs-4/packages/acs-tcl/tcl/admin-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-init.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-tcl/tcl/admin-init.tcl 3 Oct 2003 09:21:39 -0000 1.6 +++ openacs-4/packages/acs-tcl/tcl/admin-init.tcl 1 Nov 2003 08:45:37 -0000 1.7 @@ -15,10 +15,10 @@ set admin_ssl_filters_installed_p 1 db_foreach path_select {} { - ns_log Notice "Processing RestrictToSSL for $url" + ns_log Notice "admin-init.tcl: Processing RestrictToSSL for $url" foreach pattern [parameter::get -package_id $package_id -parameter RestrictToSSL] { ad_register_filter preauth GET "$url$pattern" ad_restrict_to_https - ns_log Notice "URLs matching \"$url$pattern\" are restricted to SSL" + ns_log Notice "admin-init.tcl: URLs matching \"$url$pattern\" are restricted to SSL" } } Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -r1.67 -r1.68 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 27 Oct 2003 15:06:36 -0000 1.67 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 1 Nov 2003 08:45:37 -0000 1.68 @@ -25,7 +25,7 @@ ### Scan for all unregistered .info files. - ns_log "Notice" "Scanning for new unregistered packages..." + ns_log Notice "apm_scan_packages: Scanning for new unregistered packages..." set new_spec_files [list] # Loop through all directories in the /packages directory, searching each for a # .info file. @@ -56,7 +56,7 @@ } if { [llength $new_spec_files] == 0 } { - ns_log "Notice" "No new packages found." + ns_log Notice "apm_scan_packages: No new packages found." } return $new_spec_files } @@ -79,10 +79,10 @@ } { set old_version_p 0 set found_p 0 - ns_log Debug "Scanning for $dependency_uri version $dependency_version" + ns_log Debug "apm_dependency_provided_p: Scanning for $dependency_uri version $dependency_version" db_foreach apm_dependency_check {} { if { $version_p >= 0 } { - ns_log Debug "Dependency satisfied by previously installed package" + ns_log Debug "apm_dependency_provided_p: Dependency satisfied by previously installed package" set found_p 1 } elseif { $version_p == -1 } { set old_version_p 1 @@ -103,7 +103,7 @@ set provided_p [db_string version_greater_p {}] if { $provided_p >= 0 } { - ns_log Debug "Dependency satisfied in list of provisions." + ns_log Debug "apm_dependency_provided_p: Dependency satisfied in list of provisions." return 1 } else { set old_version_p 1 @@ -437,7 +437,7 @@ # Just to get us started set updated_p 1 - ns_log Debug "STARTING DEPENDENCY CHECK" + ns_log Debug "apm_dependency_check_new: STARTING DEPENDENCY CHECK" # Outer loop tries to find a package from the repository to add if # we're stuck because of unsatisfied dependencies @@ -462,7 +462,7 @@ if { ![info exists provided($req_uri)] || \ [apm_version_names_compare $provided($req_uri) $req_version]== -1 } { - ns_log Debug "$package_key requires $req_uri $req_version => failed" + ns_log Debug "apm_dependency_check_new: $package_key requires $req_uri $req_version => failed" set satisfied_p 0 @@ -472,7 +472,7 @@ set required($req_uri) $req_version } } else { - ns_log Debug "$package_key requires $req_uri $req_version => OK" + ns_log Debug "apm_dependency_check_new: $package_key requires $req_uri $req_version => OK" } } @@ -534,7 +534,7 @@ array unset version array set version $repository($package_key) - ns_log Debug "Considering $package_key: [array get version]" + ns_log Debug "apm_dependency_check_new: Considering $package_key: [array get version]" # Let's see if this package provides anything we need foreach prov $version(provides) { @@ -544,7 +544,7 @@ if { [info exists required($prov_uri)] && \ [apm_version_names_compare $required($prov_uri) $prov_version] <= 0 } { - ns_log Debug "Adding $package_key, as it provides $prov_uri $prov_version" + ns_log Debug "apm_dependency_check_new: Adding $package_key, as it provides $prov_uri $prov_version" # If this package provides something that's required in a version high enough # add it to the pending list @@ -591,9 +591,9 @@ [apm_version_names_compare $provided($req_uri) $req_version] == -1 } { lappend failed($package_key) [list $req_uri $req_version] if { [info exists provided($req_uri)] } { - ns_log Debug "Failed dependency: $package_key requires $req_uri $req_version, but we only provide $provided($req_uri)" + ns_log Debug "apm_dependency_check_new: Failed dependency: $package_key requires $req_uri $req_version, but we only provide $provided($req_uri)" } else { - ns_log Debug "Failed dependency: $package_key requires $req_uri $req_version, but we don't have it" + ns_log Debug "apm_dependency_check_new: Failed dependency: $package_key requires $req_uri $req_version, but we don't have it" } } } @@ -754,7 +754,7 @@ if { !$version_id } { # There was an error. - ns_log Error "Package $package_key could not be installed. Received version_id $version_id" + ns_log Error "apm_package_install: Package $package_key could not be installed. Received version_id $version_id" apm_callback_and_log $callback "The package version could not be created." } # Install the parameters for the version. @@ -769,7 +769,7 @@ apm_callback_and_log $callback "

Installed $version(package-name), version $version(name).

" } { global errorInfo - ns_log Error "Error installing $version(package-name) version $version(name): $errmsg\n$errorInfo" + ns_log Error "apm_package_install: Error installing $version(package-name) version $version(name): $errmsg\n$errorInfo" apm_callback_and_log -severity Error $callback "

Failed to install $version(package-name), version $version(name). The following error was generated: 


@@ -830,7 +830,7 @@
                 # Another package is mounted at the path so we cannot mount
                 global errorInfo
                 set error_text "Package $version(package-name) could not be mounted at /$version(auto-mount) , there may already be a package mounted there, the error is: $error"
-                ns_log Error "$error_text \n\n$errorInfo"
+                ns_log Error "apm_package_install: $error_text \n\n$errorInfo"
                 apm_callback_and_log $callback "
 $error_text 
"
             } 
 
@@ -1010,7 +1010,7 @@
     foreach item $data_model_files {
 	set file_path [lindex $item 0]
 	set file_type [lindex $item 1]
-	ns_log Debug "APM: Now processing $file_path of type $file_type"
+	ns_log Debug "apm_package_install_data_model: Now processing $file_path of type $file_type"
 	if {![string compare $file_type "data_model_create"] || \
 		![string compare $file_type "data_model_upgrade"] } {
 	    if { !$ul_p } {
@@ -1033,7 +1033,7 @@
 	    db_source_sqlj_file -callback $callback "$path/$file_path"
 	    apm_callback_and_log $callback "
\n" } elseif { [string equal $file_type "ctl_file"] } { - ns_log Debug "APM: Now processing $file_path of type ctl_file" + ns_log Debug "apm_package_install_data_model: Now processing $file_path of type ctl_file" if { !$ul_p } { apm_callback_and_log $callback "