-/*
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
* Conky, a system monitor, based on torsmo
*
* Please see COPYING for details
*
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
#include "conky.h"
#include "logging.h"
#include "ccurl_thread.h"
+#include "text_object.h"
#ifdef DEBUG
#include <assert.h>
res = curl_easy_perform(curl);
if (res == CURLE_OK && chunk.size) {
- timed_thread_lock(curloc->p_timed_thread);
- (*curloc->process_function)(curloc->result, chunk.memory);
- timed_thread_unlock(curloc->p_timed_thread);
+ long http_status_code;
+
+ if(curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_status_code) == CURLE_OK && http_status_code == 200) {
+ timed_thread_lock(curloc->p_timed_thread);
+ (*curloc->process_function)(curloc->result, chunk.memory);
+ timed_thread_unlock(curloc->p_timed_thread);
+ } else {
+ NORM_ERR("curl: no data from server");
+ }
free(chunk.memory);
} else {
- ERR("curl: no data from server");
+ NORM_ERR("curl: no data from server");
}
curl_easy_cleanup(curl);
(void *)curloc, interval * 1000000);
if (!curloc->p_timed_thread) {
- ERR("curl thread: error creating timed thread");
+ NORM_ERR("curl thread: error creating timed thread");
}
timed_thread_register(curloc->p_timed_thread,
&curloc->p_timed_thread);
if (timed_thread_run(curloc->p_timed_thread)) {
- ERR("curl thread: error running timed thread");
+ NORM_ERR("curl thread: error running timed thread");
}
}
* This is where the $curl section begins.
*/
+struct curl_data {
+ char uri[128];
+ float interval;
+};
+
/* internal location pointer for use by $curl, no touchy */
static ccurl_location_t *ccurl_locations_head = 0;
}
/* straight copy, used by $curl */
-void ccurl_parse_data(void *result, const char *data)
+static void ccurl_parse_data(void *result, const char *data)
{
strncpy(result, data, max_user_text);
}
curloc->process_function = &ccurl_parse_data;
ccurl_init_thread(curloc, interval);
if (!curloc->p_timed_thread) {
- ERR("error setting up curl thread");
+ NORM_ERR("error setting up curl thread");
}
}
timed_thread_unlock(curloc->p_timed_thread);
}
+void curl_parse_arg(struct text_object *obj, const char *arg)
+{
+ int argc;
+ struct curl_data *cd;
+ float interval = 0;
+
+ cd = malloc(sizeof(struct curl_data));
+ memset(cd, 0, sizeof(struct curl_data));
+
+ argc = sscanf(arg, "%127s %f", cd->uri, &interval);
+ if (argc < 1) {
+ free(cd);
+ NORM_ERR("wrong number of arguments for $curl");
+ return;
+ }
+ cd->interval = interval > 0 ? interval * 60 : 15*60;
+ obj->data.opaque = cd;
+}
+
+void curl_print(struct text_object *obj, char *p, int p_max_size)
+{
+ struct curl_data *cd = obj->data.opaque;
+
+ if (!cd || !cd->uri) {
+ NORM_ERR("error processing Curl data");
+ return;
+ }
+ ccurl_process_info(p, p_max_size, cd->uri, cd->interval);
+}
+
+void curl_obj_free(struct text_object *obj)
+{
+ if (obj->data.opaque) {
+ free(obj->data.opaque);
+ obj->data.opaque = NULL;
+ }
+}