OpenACS

peterm
committed
MAIN:peterm:20030923202812
on 23 Sep 03
changing to check errors in the log file before the Tcl API tests as these sometimes generate errors intentionally
openacs-4/.../acs-bootstrap-installer/bootstrap.tcl (+6 -1)
122 122     # ad_parameter_cache_all 
123 123    
124 124     # Load the Tcl package init files.
125 125     apm_bootstrap_load_libraries -init acs-tcl
126 126
127 127     # Load libraries, queries etc. for remaining packages
128 128     apm_load_packages
129 129
130 130     # The acs-tcl package is a special case. Its Tcl libraries need to be loaded
131 131     # before all the other packages. However, its tests need to be loaded after all
132 132     # packages have had their Tcl libraries loaded.
133 133     apm_load_packages -load_libraries_p 0 -load_queries_p 0 -packages acs-tcl
134 134
135 135     if { ![nsv_exists rp_properties request_count] } {
136 136         # security-init.tcl has not been invoked, so it's safe to say that the
137 137         # core has not been properly initialized and the server will probably
138 138         # fail catastrophically.
139 139         bootstrap_fatal_error "The request processor routines have not been loaded."
140 140     }
141 141
  142     # Instantiate and mount core packages if not already done
  143     if { ![ad_acs_admin_node] } {
  144         apm_mount_core_packages
  145     }
  146  
142 147     ns_log "Notice" "Done loading OpenACS."
143 148 }]
144 149
145 150 if { $errno && $errno != 2 } {
146 151     # An error occured while bootstrapping. Handle it by registering a filter
147 152     # to display the error message, rather than leaving the site administrator
148 153     # to guess what broke.
149 154
150 155     # If the $errorCode is "bootstrap_fatal_error", then the error was explicitly
151 156     # thrown by a call to bootstrap_fatal_error. If not, bootstrap_fatal_error was
152 157     # never called, so we need to call it now.
153 158     global errorCode
154 159     if { [string compare $errorCode "bootstrap_fatal_error"] } {
155 160         bootstrap_fatal_error "Error during bootstrapping" 0
156 161     }
157 162 }