1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
diff --git a/kcollectd/gui.cc b/kcollectd/gui.cc
index a344f47..df3e442 100644
--- a/kcollectd/gui.cc
+++ b/kcollectd/gui.cc
@@ -59,12 +59,14 @@
#include "drag_pixmap.xpm"
-#ifndef RRD_BASEDIR
+/*#ifndef RRD_BASEDIR
#define RRD_BASEDIR "/var/lib/collectd/rrd"
-#endif
+#endif */
#define I18N_NOOP(text) text
+extern QString rrd_path;
+
static struct {
KStandardAction::StandardAction actionType;
const char *name;
@@ -372,7 +374,7 @@ KCollectdGui::KCollectdGui(QWidget *parent)
menuBar()->addMenu(helpMenu());
// build rrd-tree
- get_rrds(RRD_BASEDIR, listview());
+ get_rrds(rrd_path.toUtf8().data(), listview());
}
KCollectdGui::~KCollectdGui() {}
diff --git a/kcollectd/kcollectd.cc b/kcollectd/kcollectd.cc
index cccd3df..1f3b439 100644
--- a/kcollectd/kcollectd.cc
+++ b/kcollectd/kcollectd.cc
@@ -37,6 +37,8 @@
#include "gui.h"
+QString rrd_path = "";
+
int main(int argc, char **argv) {
using namespace boost::filesystem;
@@ -64,9 +66,18 @@ int main(int argc, char **argv) {
parser.addVersionOption();
parser.addPositionalArgument("+[file]", i18n("A kcollectd-file to open"));
+ parser.addPositionalArgument("path", i18n("rrd path"));
parser.process(application);
const QStringList args = parser.positionalArguments();
+ if (args.size() >= 2)
+ {
+ rrd_path = args.at(1);
+ }
+ else
+ {
+ rrd_path = "/var/lib/collectd/rrd";
+ }
try {
if (application.isSessionRestored()) {
kRestoreMainWindows<KCollectdGui>();
@@ -81,7 +92,7 @@ int main(int argc, char **argv) {
} catch (const std::exception &e) {
KMessageBox::error(0, i18n("Failed to read collectd-structure at \'%1\'\n"
"Terminating.",
- QString(RRD_BASEDIR)));
+ rrd_path));
exit(1);
}
|
