#include <errno.h>
#include <stdio.h>
#include <ul_log.h>
+#include <ul_logreg.h>
#include <stdbool.h>
#include <dlfcn.h>
#include <forb/forb-internal.h>
static struct option long_opts[] = {
{ "daemon", optional_argument, NULL, 'd' },
{ "id", required_argument, NULL, 'i' },
-/* { "loglevel", required_argument, NULL, 'l' }, */
+ { "loglevel", required_argument, NULL, 'l' },
{ "port", required_argument, NULL, 'p' },
{ 0, 0, 0, 0}
};
{
printf("usage: forbrun [ options ] -- <forb-server>.so [ options for forb_main() ] [-- ...]\n");
printf(" -d, --daemon [pid-file] go to background after initialization of servers\n");
- printf(" -i, --id <orb id> \n");
-/* printf(" -l, --loglevel <number>|<domain>=<number>,...\n"); */
+ printf(" -i, --id <textual orb id>\n");
+ printf(" -l, --loglevel <number>|<domain>=<number>,...\n");
printf(" -p, --port <number> listen on a fixed port number\n");
}
{
struct forb_main_data *data = arg;
int ret;
+ optind = 1;
ret = data->forb_main(data->orb, data->argc, data->argv);
free(data);
exit(ret);
forb_orb orb;
bool opt_daemon = false;
char *opt_pidfile = NULL;
- int i;
+ int i, ret;
forb_init_attr_t attr = {
- .orb_id = "org.frescor.fcb",
+ .orb_id = "",
.peer_discovery_callback = NULL, /* TODO */
.peer_dead_callback = NULL, /* TODO */
.fixed_tcp_port = 0,
};
int opt;
- while ((opt = getopt_long(argc, argv, "d::hil:p:x", &long_opts[0], NULL)) != EOF) {
+ while ((opt = getopt_long(argc, argv, "d::hi:l:p:", &long_opts[0], NULL)) != EOF) {
switch (opt) {
-#if 0
case 'l':
if (*optarg == '?') {
ul_logreg_for_each_domain(print_log_domain, NULL);
exit(0);
}
{
- int ret;
ret = ul_log_domain_arg2levels(optarg);
if (ret)
error(1, EINVAL, "Error parsing -l argument at char %d\n", ret);
}
break;
-#endif
case 'd':
opt_daemon = true;
opt_pidfile = optarg;
fosa_thread_create(&tid, NULL, forb_main_thread, data);
libs_loaded_cnt++;
- forb_wait_for_server_ready(orb);
+ ret = forb_wait_for_server_ready(orb);
+ if (ret)
+ error(1, errno, "forb_wait_for_server_ready");
}
if (opt_daemon)