aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-04-28 18:38:50 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-04-28 18:38:50 +0200
commit259a92ac4e1ac50e4c029f54265b735f6214b49d (patch)
tree611b17904d5f07ed49c79d35bd630990ef2759cc
parent04c1324c57692dfd22fab211a7443aaf484f07ce (diff)
Minor interface and implementation changes
-rw-r--r--brep/module.cxx11
-rw-r--r--web/module13
2 files changed, 16 insertions, 8 deletions
diff --git a/brep/module.cxx b/brep/module.cxx
index 4ce635a..a803386 100644
--- a/brep/module.cxx
+++ b/brep/module.cxx
@@ -35,7 +35,7 @@ namespace brep
try
{
- static const char* s[] = {"err", "warn", "info", "trace"};
+ static const char* sev_str[] = {"error", "warning", "info", "trace"};
std::ostream& o = rs.content (500, "text/plain;charset=utf-8");
for (const auto& d: e.data)
@@ -52,12 +52,17 @@ namespace brep
name = d.name;
}
- o << "[" << s[static_cast<int> (d.sev)] << "] ["
- << name << "] " << d.msg << std::endl;
+ o << name << ": " << sev_str[d.sev] << ": " << d.msg << endl;
+
+ //o << "[" << s[static_cast<int> (d.sev)] << "] ["
+ // << name << "] " << d.msg << std::endl;
}
}
catch (const sequence_error&)
{
+ // We tried to return the error status/description but some
+ // content has already been written. Nothing we can do about
+ // it.
}
}
}
diff --git a/web/module b/web/module
index 31d0967..22f9fcc 100644
--- a/web/module
+++ b/web/module
@@ -165,14 +165,17 @@ namespace web
class module
{
public:
- // The web server calls this method on the module exemplar prior
- // accepting client requests. Configuration file path is passed
- // as a parameter. The way configuration file content interpreted is
- // module implementation specific. Any exception thrown terminates web
+ // During startup the web server calls this function on the
+ // module exemplar passing a list of configuration name-value
+ // pairs. The place these configuration pairs come from is
+ // implementation-specific (normally a configuration file).
+ // Any exception thrown by this function terminates the web
// server.
//
+ // @@ Is log available? Should we pass it?
+ //
virtual void
- init (const char* path) = 0;
+ init (const name_values&) = 0;
// Any exception other than invalid_request described above that
// leaves this function is treated by the web server implementation