~hecanjog/pippi

777e11bab44e5a6b911b60409f4b269960596662 — Erik Schoster 1 year, 21 days ago da55b03
Try to recover from errors during astrid python trigger generation.
2 files changed, 6 insertions(+), 4 deletions(-)

M astrid/cython/cyrenderer.pyx
M astrid/src/renderer.c
M astrid/cython/cyrenderer.pyx => astrid/cython/cyrenderer.pyx +5 -2
@@ 665,6 665,9 @@ cdef public int astrid_schedule_python_triggers(void * msgp) except -1:
        ASTRID_INSTRUMENT.reload()
        ASTRID_INSTRUMENT.last_reload = last_edit

    return trigger_events(ASTRID_INSTRUMENT, msg)

    try:
        return trigger_events(ASTRID_INSTRUMENT, msg)
    except Exception as e:
        logger.exception('Error during scheduling of python triggers: %s' % e)
        return -1


M astrid/src/renderer.c => astrid/src/renderer.c +1 -2
@@ 177,9 177,8 @@ int main(int argc, char * argv[]) {
                if(astrid_schedule_python_triggers(&msg) < 0) {
                    PyErr_Print();
                    syslog(LOG_ERR, "CPython error during trigger planning loop\n");
                    goto lprender_cleanup;
                }
                break;
                continue;

            case LPMSG_SHUTDOWN:
                syslog(LOG_DEBUG, "Renderer got %s shutdown message:\n", msg.instrument_name);