projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First work at bug #573: Hide errors for individual servers.
[metaproxy-moved-to-github.git]
/
src
/
metaproxy_prog.cpp
diff --git
a/src/metaproxy_prog.cpp
b/src/metaproxy_prog.cpp
index
d6f8251
..
4ffcb6a
100644
(file)
--- a/
src/metaproxy_prog.cpp
+++ b/
src/metaproxy_prog.cpp
@@
-1,4
+1,4
@@
-/* $Id: metaproxy_prog.cpp,v 1.3 2006-04-29 08:47:40 adam Exp $
+/* $Id: metaproxy_prog.cpp,v 1.5 2006-04-29 08:51:54 adam Exp $
Copyright (c) 2005-2006, Index Data.
%LICENSE%
Copyright (c) 2005-2006, Index Data.
%LICENSE%
@@
-26,6
+26,7
@@
int main(int argc, char **argv)
po::options_description desc("Allowed options");
desc.add_options()
("help,h", "produce help message")
po::options_description desc("Allowed options");
desc.add_options()
("help,h", "produce help message")
+ ("version,V", "show version")
("config", po::value< std::vector<std::string> >(), "xml config")
;
("config", po::value< std::vector<std::string> >(), "xml config")
;
@@
-41,7
+42,10
@@
int main(int argc, char **argv)
std::cout << desc << "\n";
return 1;
}
std::cout << desc << "\n";
return 1;
}
-
+ if (vm.count("version")) {
+ std::cout << "Metaproxy " VERSION "\n";
+ return 0;
+ }
xmlDocPtr doc = 0;
if (vm.count("config"))
{
xmlDocPtr doc = 0;
if (vm.count("config"))
{
@@
-75,7
+79,7
@@
int main(int argc, char **argv)
pack.router(router).move();
}
catch (std::runtime_error &e) {
pack.router(router).move();
}
catch (std::runtime_error &e) {
- std::cout << "std::runtime error: " << e.what() << "\n";
+ std::cerr << "std::runtime error: " << e.what() << "\n";
std::exit(1);
}
xmlFreeDoc(doc);
std::exit(1);
}
xmlFreeDoc(doc);
@@
-90,7
+94,7
@@
int main(int argc, char **argv)
std::exit(1);
}
catch (std::runtime_error &e) {
std::exit(1);
}
catch (std::runtime_error &e) {
- std::cout << "std::runtime error: " << e.what() << "\n";
+ std::cerr << "std::runtime error: " << e.what() << "\n";
std::exit(1);
}
catch ( ... ) {
std::exit(1);
}
catch ( ... ) {