Changeset 446:8030b9729a38

Timestamp:

07/29/10 10:19:06 (38 hours ago)

Author:

roberto@…

Branch:

default

Tags:

tip

Message:

fix UNBIT compilation

Files:

• uwsgi.c (modified) (4 diffs)
• uwsgi.h (modified) (2 diffs)
• uwsgi_pymodule.c (modified) (3 diffs)
• uwsgiconfig.py (modified) (1 diff)
• uwsgistatus.py (added)

uwsgi.c

@@ -174 +174 @@
 
 
-static int unconfigured_hook(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
+int unconfigured_hook(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req) {
         uwsgi_log("-- unavailable modifier requested: %d --\n", wsgi_req->uh.modifier1);
         return -1;
@@ -224 +224 @@
 
 #ifdef UNBIT
-        struct uidsec_struct us;
+        //struct uidsec_struct us;
 #endif
 
@@ -1277 +1277 @@
                                 // checking logsize
                                 if (uwsgi.logfile) {
-                                        uwsgi_log("LOGSIZE: %d\n", lseek(2, 0, SEEK_CUR));
+                                        uwsgi.shared->logsize = lseek(2, 0, SEEK_CUR);
                                 }
                                 
@@ -2427 +2427 @@
                 }
         }
+
+        if (uwsgi.pidfile) {
+                if (PyDict_SetItemString(uwsgi.embedded_dict, "pidfile", PyString_FromString(uwsgi.pidfile))) {
+                        PyErr_Print();
+                        exit(1);
+                }
+        }
+        
 
         if (PyDict_SetItemString(uwsgi.embedded_dict, "SPOOL_RETRY", PyInt_FromLong(17))) {

uwsgi.h

@@ -681 +681 @@
         struct uwsgi_cluster_node nodes[MAX_CLUSTER_NODES];
 
+        off_t logsize;
+
 #ifdef UWSGI_SPOOLER
         pid_t spooler_pid;
@@ -1034 +1036 @@
 
 void http_loop(struct uwsgi_server *);
+
+int unconfigured_hook(struct uwsgi_server *, struct wsgi_request *);

uwsgi_pymodule.c

@@ -626 +626 @@
 #endif
 
+PyObject *py_uwsgi_has_hook(PyObject * self, PyObject * args) {
+        int modifier1;
+
+        if (!PyArg_ParseTuple(args, "i:has_hook", &modifier1)) {
+                return NULL;
+        }
+
+        if (uwsgi.shared->hooks[modifier1] != unconfigured_hook) {
+                Py_INCREF(Py_True);
+                return Py_True;
+        }
+
+        Py_INCREF(Py_None);
+        return Py_None;
+}
+
 PyObject *py_uwsgi_send_message(PyObject * self, PyObject * args) {
 
@@ -815 +831 @@
 PyObject *py_uwsgi_worker_id(PyObject * self, PyObject * args) {
         return PyInt_FromLong(uwsgi.mywid);
+}
+
+PyObject *py_uwsgi_logsize(PyObject * self, PyObject * args) {
+        return PyInt_FromLong(uwsgi.shared->logsize);
 }
 
@@ -919 +939 @@
         {"set_warning_message", py_uwsgi_warning, METH_VARARGS, ""},
         {"mem", py_uwsgi_mem, METH_VARARGS, ""},
+        {"has_hook", py_uwsgi_has_hook, METH_VARARGS, ""},
+        {"logsize", py_uwsgi_logsize, METH_VARARGS, ""},
 #ifdef UWSGI_MULTICAST
         {"send_multicast_message", py_uwsgi_multicast, METH_VARARGS, ""},

uwsgiconfig.py

@@ -325 +325 @@
 
         if UNBIT:
-                cflags.append("-DUWSGI_UNBIT")
+                cflags.append("-DUNBIT")
 
 def build_plugin(path):