repo string | commit string | message string | diff string |
|---|---|---|---|
Elleo/gst-opencv | e8320947b938fc07b8195eab82be45c3c35f9b82 | cvsmooth: Add support for video/x-raw-gray | diff --git a/src/basicfilters/gstcvsmooth.c b/src/basicfilters/gstcvsmooth.c
index 4a3fba7..ec24b2c 100644
--- a/src/basicfilters/gstcvsmooth.c
+++ b/src/basicfilters/gstcvsmooth.c
@@ -1,336 +1,338 @@
/*
* GStreamer
* Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
*
* Permission is her... |
Elleo/gst-opencv | b1572d22875dbc1828df9e9a327fd39cce5518b7 | Adding gstopencvutils | diff --git a/src/Makefile.am b/src/Makefile.am
index 17c8ddb..739d6e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,43 +1,43 @@
SUBDIRS = basicfilters edgedetect faceblur facedetect pyramidsegment templatematch textwrite
# plugindir is set in configure
plugin_LTLIBRARIES = libgstopencv.la
# sources... |
Elleo/gst-opencv | b8f1ced0499ca4c696a3afabc12fa0a16c843d32 | Adding .gitignore files | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..27c306f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+*~
+*.swp
+*.la
+*.lo
+*.o
+.deps/
+.libs/
+aclocal.m4
+autom4te.cache/
+autoregen.sh
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install... |
Elleo/gst-opencv | ee213b627eb05ccaef73a924d8c90de2fff78dd3 | cvsmooth: Adds new element cvsmooth | diff --git a/src/Makefile.am b/src/Makefile.am
index 83b4633..17c8ddb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,39 +1,43 @@
-SUBDIRS = edgedetect faceblur facedetect pyramidsegment templatematch textwrite
+SUBDIRS = basicfilters edgedetect faceblur facedetect pyramidsegment templatematch textwrite
# p... |
Elleo/gst-opencv | 4962b83afaf49a40576d8caefee54eaea92c2310 | gstopencvbasetrans: Adds this new base class | diff --git a/configure.ac b/configure.ac
index 73c418e..a9eb5f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,165 +1,165 @@
AC_INIT
dnl versions of gstreamer and plugins-base
GST_MAJORMINOR=0.10
GST_REQUIRED=0.10.0
GSTPB_REQUIRED=0.10.0
dnl fill in your package name and version here
dnl the fourth (nano... |
Elleo/gst-opencv | eecd808be02a6c564031da902a8e32d6ca144ca6 | Add libcvaux and libhighgui dependencies to debian control file | diff --git a/debian/control b/debian/control
index 2b2f8df..496302e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
Source: gst-opencv
Section: libs
Priority: extra
Maintainer: Noam Lewis <jones.noamle@gmail.com>
-Build-Depends: autoconf (>= 2.52), automake (>= 1.7), libtool (>= 1.5.0), pkg-confi... |
Elleo/gst-opencv | aa8b8f2ae911f54f1990ac608ae96abd1540335a | Add check for highgui.h and cvaux.h (fixes lp:#577562) | diff --git a/ChangeLog b/ChangeLog
index 2f6c855..aa398fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,109 +1,114 @@
+2010-05-10 Mike Sheldon <mike@mikeasoft.com>
+
+ * configure.ac:
+ Add configure check for highgui.h and cvaux.h
+
2010-04-14 Mike Sheldon <mike@mikeasoft.com>
* configure.ac:
Add configure che... |
Elleo/gst-opencv | f4928d8e8936fe115714c7ba389d76ad72b07e2c | pyramidsegment: Allocate a new buffer for output | diff --git a/src/pyramidsegment/gstpyramidsegment.c b/src/pyramidsegment/gstpyramidsegment.c
index 7e3e8fe..f6a4793 100644
--- a/src/pyramidsegment/gstpyramidsegment.c
+++ b/src/pyramidsegment/gstpyramidsegment.c
@@ -1,325 +1,335 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
... |
Elleo/gst-opencv | efe98eb21b32420e8ef510a8c639a8020e76f23b | faceblur: facedetect: templatematch: textwrite: Set buffer to writable | diff --git a/src/faceblur/gstfaceblur.c b/src/faceblur/gstfaceblur.c
index a33a708..bceb068 100644
--- a/src/faceblur/gstfaceblur.c
+++ b/src/faceblur/gstfaceblur.c
@@ -1,316 +1,317 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S. Bultje <rbultje... |
Elleo/gst-opencv | da66bdf21f7ef943d8d0b865ebf9ca8b1c46819b | edgedetect: Fix chain buffer handling | diff --git a/src/edgedetect/gstedgedetect.c b/src/edgedetect/gstedgedetect.c
index aa7b377..77e1d62 100644
--- a/src/edgedetect/gstedgedetect.c
+++ b/src/edgedetect/gstedgedetect.c
@@ -1,330 +1,335 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S.... |
Elleo/gst-opencv | ae66681c90fe230ffd8924a6b091e63070ad4660 | configure: enable -Werror to improve code | diff --git a/configure.ac b/configure.ac
index 9272730..ea0da20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,149 +1,149 @@
AC_INIT
dnl versions of gstreamer and plugins-base
GST_MAJORMINOR=0.10
GST_REQUIRED=0.10.0
GSTPB_REQUIRED=0.10.0
dnl fill in your package name and version here
dnl the fourth (nano... |
Elleo/gst-opencv | 4514ee1608f001e85f264001355a76b5607b2144 | Add config check for libswscale | diff --git a/ChangeLog b/ChangeLog
index 6c5477f..2f6c855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,104 +1,109 @@
+2010-04-14 Mike Sheldon <mike@mikeasoft.com>
+
+ * configure.ac:
+ Add configure check for libswscale (patch from Thiago Santos)
+
2010-02-28 Mike Sheldon <mike@mikeasoft.com>
* AUTHORS:
Update... |
Elleo/gst-opencv | bbc7982b8523a3f5265ebd8b29825e47917c850b | Added the property for setting the RGB colours. modified: src/textwrite/gsttextwrite.c modified: src/textwrite/gsttextwrite.h | diff --git a/src/textwrite/gsttextwrite.c b/src/textwrite/gsttextwrite.c
index c5de38a..a966571 100644
--- a/src/textwrite/gsttextwrite.c
+++ b/src/textwrite/gsttextwrite.c
@@ -1,368 +1,413 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S. Bultje ... |
Elleo/gst-opencv | 38a3469a00c204c6a77f1ee63ef7eab3b65f8461 | Added the property for setting the "thickness" of font modified: src/textwrite/gsttextwrite.c modified: src/textwrite/gsttextwrite.h | diff --git a/src/textwrite/gsttextwrite.c b/src/textwrite/gsttextwrite.c
index 807aed2..c5de38a 100644
--- a/src/textwrite/gsttextwrite.c
+++ b/src/textwrite/gsttextwrite.c
@@ -1,357 +1,368 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S. Bultje ... |
Elleo/gst-opencv | b7644070ee1d74506989a52d083a574258de2d99 | Added the property for setting x and y co-ordinates modified: src/textwrite/gsttextwrite.c modified: src/textwrite/gsttextwrite.h | diff --git a/src/textwrite/gsttextwrite.c b/src/textwrite/gsttextwrite.c
index 7449884..807aed2 100644
--- a/src/textwrite/gsttextwrite.c
+++ b/src/textwrite/gsttextwrite.c
@@ -1,356 +1,357 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S. Bultje ... |
Elleo/gst-opencv | bd87df18042d49ef0198a6c961108e3eaa137d05 | added the propery for setting x and y co-ordinates modified: src/textwrite/gsttextwrite.c modified: src/textwrite/gsttextwrite.h | diff --git a/src/textwrite/gsttextwrite.c b/src/textwrite/gsttextwrite.c
index 3369e92..7449884 100644
--- a/src/textwrite/gsttextwrite.c
+++ b/src/textwrite/gsttextwrite.c
@@ -1,329 +1,356 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S. Bultje ... |
Elleo/gst-opencv | e4bb11ea8446eb8dd0b84d1e4a1076b4816a87d8 | Add libswscale-dev to debian build-deps and libswscale0 to deps | diff --git a/debian/changelog b/debian/changelog
index ba15356..e519d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,30 +1,36 @@
+gst-opencv (0.1+git20100301ubuntu2) karmic; urgency=low
+
+ * Add libswscale-dev to build-deps and libswscale0 to deps
+
+ -- Mike Sheldon <mike@mikeasoft.com> Mon, 01 Mar 20... |
Elleo/gst-opencv | 06173ccab44910582cfe8004a2e843e709160742 | modified: AUTHORS | diff --git a/AUTHORS b/AUTHORS
index 17bd6f8..7534cb4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
Mike Sheldon <mike@mikeasoft.com>
Noam Lewis <jones.noamle@gmail.com>
Kapil Agrawal <kapil@mediamagictechnologies.com>
Thomas Vander Stichele <thomas@apestaart.org>
-Sreerenj Balachandran <bsreerenj@gmail.com>
+... |
Elleo/gst-opencv | b16903e6455dd5f475a18a975e41786adb7be58d | Apply Stefan's faceblur fixes to facedetect | diff --git a/src/facedetect/gstfacedetect.c b/src/facedetect/gstfacedetect.c
index 70e717f..0928b45 100644
--- a/src/facedetect/gstfacedetect.c
+++ b/src/facedetect/gstfacedetect.c
@@ -1,342 +1,345 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S.... |
Elleo/gst-opencv | e30bc4032b6898dd462a8afefbcb3f227c5d1dde | Add simple text overlay plugin | diff --git a/AUTHORS b/AUTHORS
index 140d640..52ac932 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,5 @@
Mike Sheldon <mike@mikeasoft.com>
Noam Lewis <jones.noamle@gmail.com>
Kapil Agrawal <kapil@mediamagictechnologies.com>
Thomas Vander Stichele <thomas@apestaart.org>
+Sreerenj Balachandran <bsreerenj@gmail.com>
d... |
Elleo/gst-opencv | 97eaa64c4246ec5459f81e8b34603b3fbf5de186 | faceblur: fix handling of profile property. | diff --git a/src/faceblur/gstfaceblur.c b/src/faceblur/gstfaceblur.c
index e9da8f8..5f1deb3 100644
--- a/src/faceblur/gstfaceblur.c
+++ b/src/faceblur/gstfaceblur.c
@@ -1,313 +1,316 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyright (C) 2005 Ronald S. Bultje <rbultje... |
Elleo/gst-opencv | b76cab6955b223d18f059ec10428aaa0359f486e | Fix includes in template matching element | diff --git a/src/templatematch/gsttemplatematch.h b/src/templatematch/gsttemplatematch.h
index d4f8414..b18e0c7 100644
--- a/src/templatematch/gsttemplatematch.h
+++ b/src/templatematch/gsttemplatematch.h
@@ -1,92 +1,92 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copyri... |
Elleo/gst-opencv | 3435bb2200294a321b4ca53144af08daf3b6701b | Bring code in to line with general Gstreamer standards | diff --git a/ChangeLog b/ChangeLog
index a871587..dd740cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,68 +1,81 @@
2009-05-26 Mike Sheldon <mike@mikeasoft.com>
* AUTHORS:
Add all current contributors to the authors list
+ * src/edgedetect/gstedgedetect.c:
+ * src/edgedetect/gstedgedetect.h:
+ * src/faceblur/... |
Elleo/gst-opencv | dcdc07127da7a85359530a7e520c17554b0f710c | Add all current contributors to the authors list | diff --git a/AUTHORS b/AUTHORS
index 1bb7449..140d640 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,4 @@
+Mike Sheldon <mike@mikeasoft.com>
+Noam Lewis <jones.noamle@gmail.com>
+Kapil Agrawal <kapil@mediamagictechnologies.com>
Thomas Vander Stichele <thomas@apestaart.org>
diff --git a/ChangeLog b/ChangeLog
index 6699d28... |
Elleo/gst-opencv | a051b13c30d081c3c4da0e50ff77165b076d4fe2 | Fix segfault in template match element if no template has been set Add template matching python example Add autotool, libtool and pkgconfig dependencies to debian control file | diff --git a/ChangeLog b/ChangeLog
index bcb6ed0..6699d28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,51 +1,63 @@
2009-05-25 Mike Sheldon <mike@mikeasoft.com>
* configure.ac:
* src/Makefile.am:
* src/gstopencv.c:
* src/faceblur/gstfaceblur.c:
* src/faceblur/gstfaceblur.h:
* src/faceblur/Makefile.am:
... |
Elleo/gst-opencv | 2715db91bec610813af21aacef387cdfb0197de2 | Fix debian package section | diff --git a/debian/changelog b/debian/changelog
index 1f78575..c8db1a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-gst-opencv (0.1+git20090525) jaunty; urgency=low
+gst-opencv (0.1+git20090525ubuntu2) jaunty; urgency=low
+
+ * Fix package section
+
+ -- Mike Sheldon <mike@mikeasoft.com> M... |
Elleo/gst-opencv | cee6db97f245c421fbe79593304e9d9d12ccf448 | Add a plugin for automatically blurring faces in videos and images | diff --git a/configure.ac b/configure.ac
index 90c5c4b..e582dc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,142 +1,142 @@
AC_INIT
dnl versions of gstreamer and plugins-base
GST_MAJORMINOR=0.10
GST_REQUIRED=0.10.0
GSTPB_REQUIRED=0.10.0
dnl fill in your package name and version here
dnl the fourth (nano... |
Elleo/gst-opencv | a9367e00000e7b61cc139d7193cf9d776983e39b | Added control for changing method | diff --git a/src/templatematch/gsttemplatematch.c b/src/templatematch/gsttemplatematch.c
index b9f5779..84675d5 100644
--- a/src/templatematch/gsttemplatematch.c
+++ b/src/templatematch/gsttemplatematch.c
@@ -1,379 +1,402 @@
/*
* GStreamer
* Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
* Copy... |
Elleo/gst-opencv | d837737abc9809f607f8b9412937cc4d5a3ca2a7 | Added templatematch element | diff --git a/configure.ac b/configure.ac
index 90c5c4b..8d1eb8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,142 +1,142 @@
AC_INIT
dnl versions of gstreamer and plugins-base
GST_MAJORMINOR=0.10
GST_REQUIRED=0.10.0
GSTPB_REQUIRED=0.10.0
dnl fill in your package name and version here
dnl the fourth (nano... |
Elleo/gst-opencv | 29bf3319e88791be4c3d349c786876185f02f7fc | Added debian dir for building a .deb | diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..990d1b0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+gst-opencv (0.5-1) jaunty; urgency=low
+
+ * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+
+ -- Noam Lewis <jones.noamle@gmail.com> Mon, 27 Apr 2... |
Elleo/gst-opencv | 80ab2679f1d56651d92ebca68eba2e8bd944b21f | Registering all elements under opencv plugin | diff --git a/ChangeLog b/ChangeLog
index 9214308..4169b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,31 @@
+2009-05-08 Kapil Agrawal <kapil@mediamagictechnologies.com>
+
+ * configure.ac:
+ * src/Makefile.am:
+ * src/gstopencv.c:
+ * src/edgedetect/Makefile.am:
+ * src/edgedetect/gstedgedetect.c:
+ * src/faced... |
Elleo/gst-opencv | d2b778b6c2d2ee050f64ecbb55d3a590b94a1793 | Fix the profile parameter in the facedetect element to accept a string correctly | diff --git a/ChangeLog b/ChangeLog
index 1ac8d11..9214308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,18 @@
2009-05-06 Mike Sheldon <mike@mikeasoft.com>
+ * src/facedetect/gstfacedetect.c:
+ Fix "profile" parameter in face detect element to accept a string correctly
+ (was using char param instead of st... |
Elleo/gst-opencv | 81a57797c6a901f320ceaeddf06cb50c4f60e07b | Release OpenCV images when finalizing elements | diff --git a/ChangeLog b/ChangeLog
index be865d5..1ac8d11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
-2009-04-06 Kapil Agrawal <kapil@mediamagictechnologies.com>
+2009-05-06 Mike Sheldon <mike@mikeasoft.com>
+
+ * src/edgedetect/gstedgedetect.c:
+ * src/pyramidsegment/gstpyramidsegemnt.c:
+ * src/facedet... |
Elleo/gst-opencv | 0b2ec7a5b38225278b3941151d4e66888c92a0e3 | Fixed compile errors | diff --git a/ChangeLog b/ChangeLog
index fd587e4..be865d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,207 +1,7 @@
-2008-08-11 Stefan Kost <ensonic@users.sf.net>
+2009-04-06 Kapil Agrawal <kapil@mediamagictechnologies.com>
- * README:
- * src/gstaudiofilter.c:
- * src/gstplugin.c:
- * src/gsttransform.c:
- * tools... |
Elleo/gst-opencv | c01ab385196b7aaf0d2bb2f91f22ac106a7df5d8 | Make face detect send a bus message when a face is detected Write a simple python example for face detection | diff --git a/examples/python/facedetect.py b/examples/python/facedetect.py
new file mode 100755
index 0000000..7ffc03a
--- /dev/null
+++ b/examples/python/facedetect.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+import pygst
+pygst.require("0.10")
+import gst
+import gtk
+
+class FaceDetect:
+
+ def __init__(self):
+ pi... |
Elleo/gst-opencv | 3e645658929ea14c3d9a56dd3bb14c2c48c4d534 | * Fix package name in autogen * Remove template README | diff --git a/README b/README
index 1905684..2d1d2e8 100644
--- a/README
+++ b/README
@@ -1,34 +1 @@
-WHAT IT IS
-----------
-
-gst-plugin is a template for writing your own GStreamer plug-in.
-
-The code is deliberately kept simple so that you quickly understand the basics
-of how to set up autotools and your source tr... |
parabuzzle/cistern | 037189b88dc83a6f513b15c56f867c74b00010a0 | Added ack codes to collector for verifing on the agent side | diff --git a/src/server/lib/modules/collection_server.rb b/src/server/lib/modules/collection_server.rb
index b5c610a..a2c105e 100644
--- a/src/server/lib/modules/collection_server.rb
+++ b/src/server/lib/modules/collection_server.rb
@@ -1,99 +1,104 @@
module CollectionServer
#TODO: Checksum check should be wrap... |
parabuzzle/cistern | 906eb055dcd3d04320ec9fe00df1858e94bc1eb5 | Added reconnect logic to agent code. | diff --git a/src/agent/agent.rb b/src/agent/agent.rb
index 6849603..17acf5d 100644
--- a/src/agent/agent.rb
+++ b/src/agent/agent.rb
@@ -1,55 +1,54 @@
require 'rubygems'
require 'eventmachine'
require 'lib/modules.rb'
require 'socket'
require 'file/tail'
require 'yaml'
require 'digest/md5'
require 'commands.rb'... |
parabuzzle/cistern | f51b477af8b91bb06f539ecc670c4fc0734f16c6 | Started hardening the agent code | diff --git a/src/agent/agent.rb b/src/agent/agent.rb
index 6849603..fbcf8ca 100644
--- a/src/agent/agent.rb
+++ b/src/agent/agent.rb
@@ -1,55 +1,69 @@
require 'rubygems'
require 'eventmachine'
require 'lib/modules.rb'
require 'socket'
require 'file/tail'
require 'yaml'
require 'digest/md5'
require 'commands.rb'... |
parabuzzle/cistern | d797d16a9850770bf77ccc70dbf85557ff6444ee | added stats pages | diff --git a/src/server/app/controllers/stats_controller.rb b/src/server/app/controllers/stats_controller.rb
new file mode 100644
index 0000000..827d5ad
--- /dev/null
+++ b/src/server/app/controllers/stats_controller.rb
@@ -0,0 +1,13 @@
+class StatsController < ApplicationController
+
+ def index
+ @title = "Stat... |
parabuzzle/cistern | 8523b8c85a1b048ddcaf9dd5802628f2e521dbd6 | ignore tmp directory | diff --git a/.gitignore b/.gitignore
index c2238c9..bb72fb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
*.log
*.pid
*.sqlite3
src/server/config/database.yml
src/server/config/daemons.yml
src/server/config/collectors.yml
src/server/config/cistern.yml
src/server/config/memcached.yml
src/server/ind... |
parabuzzle/cistern | e41e3ae8c8487e3a04544ce231d0c526e8e8eba4 | Added agent to logtype check for log collector and exception handling on invalid agent_id and/or logtype_id | diff --git a/src/server/lib/modules/collection_server.rb b/src/server/lib/modules/collection_server.rb
index 7dfbdc1..b5c610a 100644
--- a/src/server/lib/modules/collection_server.rb
+++ b/src/server/lib/modules/collection_server.rb
@@ -1,89 +1,99 @@
module CollectionServer
#TODO: Checksum check should be wrapp... |
parabuzzle/cistern | 43d15cc086503ccb62ec366a3338ae05dc94e645 | added cascading del methods to the models... may not need them | diff --git a/src/server/app/models/agent.rb b/src/server/app/models/agent.rb
index 8c08f7d..691608d 100644
--- a/src/server/app/models/agent.rb
+++ b/src/server/app/models/agent.rb
@@ -1,37 +1,45 @@
class Agent < ActiveRecord::Base
acts_as_ferret :fields => [:hostname, :name, :port]
has_and_belongs_to_many :... |
parabuzzle/cistern | 5572853e6a91c4ff1ac63cbf5390b3eb425749c8 | Fixed line breaks in search results and made the onclick javascript more standards compliant | diff --git a/src/server/app/views/agents/index.rhtml b/src/server/app/views/agents/index.rhtml
index d0763b0..20b5088 100644
--- a/src/server/app/views/agents/index.rhtml
+++ b/src/server/app/views/agents/index.rhtml
@@ -1,33 +1,33 @@
<h1>Agents</h1>
<div class="subnav"><%=link_to("Create new Agent #{image_tag("add... |
parabuzzle/cistern | 8969d52b1fa2665ff3557a09c097ae4d2b9fbe3e | Changed layout to wide for easier log reading | diff --git a/src/server/public/stylesheets/main.css b/src/server/public/stylesheets/main.css
index 02ca319..89aa4ea 100644
--- a/src/server/public/stylesheets/main.css
+++ b/src/server/public/stylesheets/main.css
@@ -1,245 +1,246 @@
body {
background: #fff;
color: #000;
margin: 0px;
padding: 0px;
color: #33... |
parabuzzle/cistern | 0b3a2a26274964f43bb8c3ee5e2c45cb876be5b4 | bad times being commited. changed etime to int | diff --git a/src/server/app/models/event.rb b/src/server/app/models/event.rb
index e25e713..8b096fb 100644
--- a/src/server/app/models/event.rb
+++ b/src/server/app/models/event.rb
@@ -1,25 +1,25 @@
class Event < ActiveRecord::Base
include ApplicationHelper
acts_as_ferret :fields => ['full_event', :etime]
... |
parabuzzle/cistern | 138af2ce0eed3efa65a9f04c8772a8d6a1ba9aa3 | ignoring rubymine files | diff --git a/.gitignore b/.gitignore
index f7f726b..c2238c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
*.log
*.pid
*.sqlite3
src/server/config/database.yml
src/server/config/daemons.yml
src/server/config/collectors.yml
src/server/config/cistern.yml
src/server/config/memcached.yml
src/server/ind... |
parabuzzle/cistern | 5f0cf8251f99cd9c6237771c0e51950f07da3723 | fixed issue 16 | diff --git a/src/server/app/views/logtypes/search.rhtml b/src/server/app/views/logtypes/search.rhtml
index 9b97344..ed9db0f 100644
--- a/src/server/app/views/logtypes/search.rhtml
+++ b/src/server/app/views/logtypes/search.rhtml
@@ -1,24 +1,24 @@
<div class="rightsearch">
<div>
<% form_for :search, :url => { :id ... |
parabuzzle/cistern | 6a9317c09f7bc7368123b32f8c220c66a0bbf528 | Dealing with newlines at the beginning of event lines | diff --git a/src/server/config/initializers/extended_modules.rb b/src/server/config/initializers/extended_modules.rb
index 2d44c4e..0df7603 100644
--- a/src/server/config/initializers/extended_modules.rb
+++ b/src/server/config/initializers/extended_modules.rb
@@ -1,18 +1,19 @@
#This initializer is used to pull in mod... |
parabuzzle/cistern | 323b342074cc21ab6ebb728b5f0beafa2ae17d29 | Working on log4j apo | diff --git a/src/plugins/log4j/.classpath b/src/plugins/log4j/.classpath
index e27f6e5..d8b3f86 100644
--- a/src/plugins/log4j/.classpath
+++ b/src/plugins/log4j/.classpath
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ ... |
parabuzzle/cistern | 6f263deae13166c4b3680320e4bfb03d4d8b25fd | Added the log4j appender I am working on | diff --git a/src/plugins/log4j/.classpath b/src/plugins/log4j/.classpath
new file mode 100644
index 0000000..e27f6e5
--- /dev/null
+++ b/src/plugins/log4j/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classp... |
parabuzzle/cistern | 250056dee3066c0bc307cbbf48b1a52c330fd02c | added pre block to command output on the frontend to preserve spacing provided by the agent | diff --git a/src/server/app/views/agents/commands.rhtml b/src/server/app/views/agents/commands.rhtml
index 728cf70..bcc7cf5 100644
--- a/src/server/app/views/agents/commands.rhtml
+++ b/src/server/app/views/agents/commands.rhtml
@@ -1,20 +1,21 @@
<% if @commands == false or @output == false%>
<h1>Agent is not listeni... |
parabuzzle/cistern | 4d6813073169b01b56a149a5249437973b0700e9 | Fixed command output escaping and some agent junk | diff --git a/src/agent/commands.rb b/src/agent/commands.rb
index 05a1e76..2691f67 100644
--- a/src/agent/commands.rb
+++ b/src/agent/commands.rb
@@ -1,15 +1,18 @@
module AgentCommands
def ps_auxx
return `ps auxx`
end
+ def top
+ return `top -l 1`
+ end
def get_users
return `w`
end
... |
parabuzzle/cistern | 1ea8a4d8150f2964203700cff817bebc80a2ffca | added timeout on agent listener test if a firewall drops the packet | diff --git a/src/server/app/helpers/agents_helper.rb b/src/server/app/helpers/agents_helper.rb
index db8964e..30d399c 100644
--- a/src/server/app/helpers/agents_helper.rb
+++ b/src/server/app/helpers/agents_helper.rb
@@ -1,68 +1,74 @@
include Socket::Constants
module AgentsHelper
def get_commands(agent)
b... |
parabuzzle/cistern | 7bc1f89de15b3e699e96522da21fc8e1dc17d389 | Added check for agent listener | diff --git a/src/server/app/helpers/agents_helper.rb b/src/server/app/helpers/agents_helper.rb
index ae47c9f..db8964e 100644
--- a/src/server/app/helpers/agents_helper.rb
+++ b/src/server/app/helpers/agents_helper.rb
@@ -1,57 +1,68 @@
include Socket::Constants
module AgentsHelper
def get_commands(agent)
b... |
parabuzzle/cistern | 637eaba7aaf8e466407629fbd8055a323742ed33 | pulled out puts of command response. TODO: add try/catch blocks and logger for agent | diff --git a/src/agent/lib/modules.rb b/src/agent/lib/modules.rb
index b7b3bcd..4048595 100644
--- a/src/agent/lib/modules.rb
+++ b/src/agent/lib/modules.rb
@@ -1,81 +1,80 @@
module CommandServer
def check_sig(serverkey, payload)
if serverkey != Digest::MD5.hexdigest("14f65b5c37d30db7db5b1298dc85acd3" + pa... |
parabuzzle/cistern | d75694c360b0a74b0a5c471b47e5de5fbb44330e | made the agent work with model files | diff --git a/src/agent/agent.rb b/src/agent/agent.rb
index 4232e34..6849603 100644
--- a/src/agent/agent.rb
+++ b/src/agent/agent.rb
@@ -1,26 +1,55 @@
require 'rubygems'
require 'eventmachine'
require 'lib/modules.rb'
require 'socket'
require 'file/tail'
require 'yaml'
require 'digest/md5'
-require 'lib/commands... |
parabuzzle/cistern | 419bd9bdef0617d1371d1bac1b62e5e540cd0cec | Fixed new lines in log entries in views | diff --git a/src/agent/lib/commands.rb b/src/agent/lib/commands.rb
index 088581e..05a1e76 100644
--- a/src/agent/lib/commands.rb
+++ b/src/agent/lib/commands.rb
@@ -1,11 +1,15 @@
module AgentCommands
def ps_auxx
return `ps auxx`
end
def get_users
return `w`
end
+ def say_foo
+ retur... |
parabuzzle/cistern | 017b0818d9899bb572b83404a80c9ee9f0c881df | Removed schema.rb from source | diff --git a/.gitignore b/.gitignore
index b9d47a8..f7f726b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
*.log
*.pid
*.sqlite3
src/server/config/database.yml
src/server/config/daemons.yml
src/server/config/collectors.yml
src/server/config/cistern.yml
src/server/config/memcached.yml
src/server/inde... |
parabuzzle/cistern | e8a219973e9e8326e06d5544aeb1206bfb9d088d | Fixed schema and migrations | diff --git a/src/server/db/migrate/20090721233433_create_events.rb b/src/server/db/migrate/20090721233433_create_events.rb
index 5377908..4e39165 100644
--- a/src/server/db/migrate/20090721233433_create_events.rb
+++ b/src/server/db/migrate/20090721233433_create_events.rb
@@ -1,22 +1,22 @@
class CreateEvents < ActiveR... |
parabuzzle/cistern | 7c613d130b00875828fe91ea6473635fce1b20cc | Added commands for agents and started on the agent stuff | diff --git a/src/agent/agent.rb b/src/agent/agent.rb
index 100975e..4232e34 100644
--- a/src/agent/agent.rb
+++ b/src/agent/agent.rb
@@ -1,58 +1,26 @@
require 'rubygems'
require 'eventmachine'
require 'lib/modules.rb'
require 'socket'
require 'file/tail'
+require 'yaml'
+require 'digest/md5'
+require 'lib/commands... |
parabuzzle/cistern | a23071626792ffd980a290f3211a7ea797117689 | Added h() to all user and log generated data in the views. | diff --git a/src/server/app/controllers/agents_controller.rb b/src/server/app/controllers/agents_controller.rb
index 84ebb4d..2c61c63 100644
--- a/src/server/app/controllers/agents_controller.rb
+++ b/src/server/app/controllers/agents_controller.rb
@@ -1,85 +1,88 @@
class AgentsController < ApplicationController
... |
parabuzzle/cistern | 4dc2491500ab776115b70f25efb512dbcb49ff3c | Fixed up the tests | diff --git a/src/server/test/fixtures/agents.yml b/src/server/test/fixtures/agents.yml
index 3980eb1..0af6bb7 100644
--- a/src/server/test/fixtures/agents.yml
+++ b/src/server/test/fixtures/agents.yml
@@ -1,20 +1,20 @@
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
# one:
# column: valu... |
parabuzzle/cistern | 89132feb2c2a86be58b9ca9b18d670b0c02499bb | Changed order in view to be oldest at the bottom (more like a log) | diff --git a/src/server/app/views/agents/show.rhtml b/src/server/app/views/agents/show.rhtml
index ff45d2c..c899ce5 100644
--- a/src/server/app/views/agents/show.rhtml
+++ b/src/server/app/views/agents/show.rhtml
@@ -1,52 +1,52 @@
<div class="rightsearch">
<div>
<% form_for :search, :url => { :id => params[:id]} ... |
parabuzzle/cistern | 0fed3a3359faa27391c8695f164fc6875e477e80 | Small api change big break | diff --git a/src/agent/agent.rb b/src/agent/agent.rb
index 8bf5d7c..100975e 100644
--- a/src/agent/agent.rb
+++ b/src/agent/agent.rb
@@ -1,28 +1,58 @@
require 'rubygems'
require 'eventmachine'
require 'lib/modules.rb'
require 'socket'
+require 'file/tail'
+include File::Tail
include Socket::Constants
+BREAK = "_... |
parabuzzle/cistern | a3b96b64a38d162e799250dcd6f8d4967a2b70d3 | Performance tuning - added cached check in logcollector | diff --git a/src/server/lib/modules/collection_server.rb b/src/server/lib/modules/collection_server.rb
index 82d46ce..246b018 100644
--- a/src/server/lib/modules/collection_server.rb
+++ b/src/server/lib/modules/collection_server.rb
@@ -1,77 +1,85 @@
module CollectionServer
#TODO: Checksum check should be wrapp... |
parabuzzle/cistern | e404fc613ff391f7a35059ff59a044bf47b31d51 | Implemented memcache for staticentry caching on event rebuild | diff --git a/.gitignore b/.gitignore
index fe383b9..b9d47a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
*.log
*.pid
*.sqlite3
src/server/config/database.yml
src/server/config/daemons.yml
src/server/config/collectors.yml
+src/server/config/cistern.yml
+src/server/config/memcached.yml
src/server/index... |
parabuzzle/cistern | 9c07cdf413eb0ff5d594adacc74336ebedfe2cff | Fixed issue 6 for localhost in hostname bug | diff --git a/src/server/app/models/agent.rb b/src/server/app/models/agent.rb
index 9b23267..8c08f7d 100644
--- a/src/server/app/models/agent.rb
+++ b/src/server/app/models/agent.rb
@@ -1,37 +1,37 @@
class Agent < ActiveRecord::Base
acts_as_ferret :fields => [:hostname, :name, :port]
has_and_belongs_to_many :... |
parabuzzle/cistern | 999d2ff9f870643dc25656f81adc7b27c7bc3479 | Made the view pretty and fixed up the search a bunch | diff --git a/src/server/app/controllers/agents_controller.rb b/src/server/app/controllers/agents_controller.rb
index 2c50a0e..84ebb4d 100644
--- a/src/server/app/controllers/agents_controller.rb
+++ b/src/server/app/controllers/agents_controller.rb
@@ -1,71 +1,85 @@
class AgentsController < ApplicationController
... |
parabuzzle/cistern | 4efc3bc56bee12f2ffeeca20b342f68e158d3fd5 | Viewing by logtype can also view by loglevel | diff --git a/src/server/app/controllers/logtypes_controller.rb b/src/server/app/controllers/logtypes_controller.rb
index 1539421..9212f87 100644
--- a/src/server/app/controllers/logtypes_controller.rb
+++ b/src/server/app/controllers/logtypes_controller.rb
@@ -1,60 +1,64 @@
class LogtypesController < ApplicationContro... |
parabuzzle/cistern | 149f766906aa2a3d5fb3d8002e6e3483f6a1f198 | Viewing by agent can also filter by loglevel | diff --git a/src/server/app/controllers/agents_controller.rb b/src/server/app/controllers/agents_controller.rb
index 1e9d7b5..2c50a0e 100644
--- a/src/server/app/controllers/agents_controller.rb
+++ b/src/server/app/controllers/agents_controller.rb
@@ -1,67 +1,71 @@
class AgentsController < ApplicationController
... |
parabuzzle/cistern | 1c9011d19d40d5f926f000864d937916c0d7aecb | Search filter should work now | diff --git a/src/server/app/controllers/search_controller.rb b/src/server/app/controllers/search_controller.rb
index 5afccba..a133f45 100644
--- a/src/server/app/controllers/search_controller.rb
+++ b/src/server/app/controllers/search_controller.rb
@@ -1,21 +1,52 @@
class SearchController < ApplicationController
+ in... |
parabuzzle/cistern | 2e9590f857a3db4027f97fc42f6da4991a7ba1d0 | Tied the search box to the search controller. Need to format events and search results now | diff --git a/src/server/app/controllers/search_controller.rb b/src/server/app/controllers/search_controller.rb
new file mode 100644
index 0000000..5afccba
--- /dev/null
+++ b/src/server/app/controllers/search_controller.rb
@@ -0,0 +1,21 @@
+class SearchController < ApplicationController
+
+ def index
+ @title = "... |
parabuzzle/cistern | 00f95fa82fdcefb431aca55726de1017e24bed41 | Frontend work to make the application more intuitive to use | diff --git a/src/server/app/controllers/agents_controller.rb b/src/server/app/controllers/agents_controller.rb
index 8cdb3b2..1e9d7b5 100644
--- a/src/server/app/controllers/agents_controller.rb
+++ b/src/server/app/controllers/agents_controller.rb
@@ -1,65 +1,67 @@
class AgentsController < ApplicationController
... |
parabuzzle/cistern | e3b2ae5999b23f4e44f2e2b2a0f7a0bf0e584166 | Pulled in the acts_as_ferret plugin instead of relying on the gem | diff --git a/src/server/config/environment.rb b/src/server/config/environment.rb
index e0f5aac..99b1152 100644
--- a/src/server/config/environment.rb
+++ b/src/server/config/environment.rb
@@ -1,44 +1,44 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendo... |
parabuzzle/cistern | 0421d98884f9dbf4e5d64e2bdea4a071ed176c3e | Working ferret ready for frontend | diff --git a/src/agent/logsender.rb b/src/agent/logsender.rb
index 2351df9..7f3f8dd 100644
--- a/src/agent/logsender.rb
+++ b/src/agent/logsender.rb
@@ -1,60 +1,60 @@
require 'socket'
require 'yaml'
require 'digest/md5'
include Socket::Constants
@break = "__1_BB"
@value = "__1_VV"
@checksum = "__1_CC"
def... |
parabuzzle/cistern | e53f92ebf91b5be0dbb87c3332508cda7f75bf55 | Started on ferret integration | diff --git a/.gitignore b/.gitignore
index 41bf3c2..fe383b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.log
*.pid
*.sqlite3
src/server/config/database.yml
src/server/config/daemons.yml
src/server/config/collectors.yml
+src/server/index
diff --git a/src/server/app/models/event.rb b/src/server/app/mo... |
parabuzzle/cistern | 1511cb32613d4fac5e502e2901e9b0d2f915614f | working on the agent controls for the frontend | diff --git a/src/server/app/controllers/agents_controller.rb b/src/server/app/controllers/agents_controller.rb
index 389b744..8cdb3b2 100644
--- a/src/server/app/controllers/agents_controller.rb
+++ b/src/server/app/controllers/agents_controller.rb
@@ -1,19 +1,65 @@
class AgentsController < ApplicationController
... |
parabuzzle/cistern | 3b9f50bea0b6791e10ced05ecc732fbc5ec030b4 | Changed the frontend to support loglevel schema change | diff --git a/src/server/app/controllers/agents_controller.rb b/src/server/app/controllers/agents_controller.rb
index a0eb85a..389b744 100644
--- a/src/server/app/controllers/agents_controller.rb
+++ b/src/server/app/controllers/agents_controller.rb
@@ -1,19 +1,19 @@
class AgentsController < ApplicationController
... |
parabuzzle/cistern | 2a4b6aef7b1f2b0e8f1db7f7de94b20ebe5ecb88 | Pulled loglevel out of event and made a table for it. This allows for filtering by loglevel in the frontend | diff --git a/src/server/app/models/event.rb b/src/server/app/models/event.rb
index 81c3b09..6c00a56 100644
--- a/src/server/app/models/event.rb
+++ b/src/server/app/models/event.rb
@@ -1,13 +1,14 @@
class Event < ActiveRecord::Base
belongs_to :staticentry
belongs_to :agent
+ belongs_to :loglevel
cattr_re... |
parabuzzle/cistern | 8d3775c2caba37926aceac560e7621fcc9942ae4 | removed config files and made example configs | diff --git a/.gitignore b/.gitignore
index 68931b8..41bf3c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
*.log
*.pid
*.sqlite3
+src/server/config/database.yml
+src/server/config/daemons.yml
+src/server/config/collectors.yml
diff --git a/src/server/config/collectors.yml b/src/server/config/collectors-exam... |
parabuzzle/cistern | 6068467a5058fc3a2fbac255dcd5112b1171afd1 | Fixed some random bugs | diff --git a/src/agent/logsender.rb b/src/agent/logsender.rb
index 0b438f0..23c3b9c 100644
--- a/src/agent/logsender.rb
+++ b/src/agent/logsender.rb
@@ -1,60 +1,60 @@
require 'socket'
require 'yaml'
require 'digest/md5'
include Socket::Constants
@break = "__1_BB"
@value = "__1_VV"
@checksum = "__1_CC"
def... |
parabuzzle/cistern | 38a32b724c6a15524c150953ea44f194543da6fe | basic log browsing is done | diff --git a/src/server/app/controllers/agents_controller.rb b/src/server/app/controllers/agents_controller.rb
new file mode 100644
index 0000000..a0eb85a
--- /dev/null
+++ b/src/server/app/controllers/agents_controller.rb
@@ -0,0 +1,19 @@
+class AgentsController < ApplicationController
+
+ def index
+ @title = "... |
parabuzzle/cistern | 9a80a7291114e5c70132b4bda04ee2c988a78ccd | Added pagination for events | diff --git a/src/server/app/controllers/events_controller.rb b/src/server/app/controllers/events_controller.rb
index 180482b..50d0697 100644
--- a/src/server/app/controllers/events_controller.rb
+++ b/src/server/app/controllers/events_controller.rb
@@ -1,17 +1,17 @@
class EventsController < ApplicationController
in... |
parabuzzle/cistern | 501a7554e9ec3bc08b4ff2941f517c638e8bf609 | Front end work. Added methods for constructing logevents based on static data for display | diff --git a/src/server/app/controllers/application_controller.rb b/src/server/app/controllers/application_controller.rb
index 6635a3f..6605d54 100644
--- a/src/server/app/controllers/application_controller.rb
+++ b/src/server/app/controllers/application_controller.rb
@@ -1,10 +1,11 @@
# Filters added to this controll... |
parabuzzle/cistern | 8a50774d149bc964178f189d9a3f537d9f245c8c | started on the frontend | diff --git a/src/server/app/controllers/events_controller.rb b/src/server/app/controllers/events_controller.rb
new file mode 100644
index 0000000..5175242
--- /dev/null
+++ b/src/server/app/controllers/events_controller.rb
@@ -0,0 +1,2 @@
+class EventsController < ApplicationController
+end
diff --git a/src/server/app/... |
parabuzzle/cistern | 6687195cb1e88d336188f65df794ef585118796c | Refactored some stuff in the log collection module. Also made packet checksum validations work along with agent key checks | diff --git a/src/agent/logsender.rb b/src/agent/logsender.rb
index e1dd34f..0b438f0 100644
--- a/src/agent/logsender.rb
+++ b/src/agent/logsender.rb
@@ -1,25 +1,60 @@
require 'socket'
require 'yaml'
+require 'digest/md5'
include Socket::Constants
+@break = "__1_BB"
+@value = "__1_VV"
+@checksum = "__1_CC"
+
+
def... |
parabuzzle/cistern | e43e13b766e07f9e460fcb1e8f9d45b3913f27f5 | didn't like the eventmachine modules being loaded in the initializers directory. I moved the modules to lib/modules and use an initializers file to init the modules... cleaner is better | diff --git a/src/server/config/initializers/collector.rb b/src/server/config/initializers/collector.rb
deleted file mode 100644
index 45bd48f..0000000
--- a/src/server/config/initializers/collector.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'digest/md5'
-module CollectionServer
-
- def post_init
- port, ip = Socke... |
parabuzzle/cistern | a4d21ae411153810e148e74769561903775dfca3 | Added a bunch of unit tests and validations | diff --git a/src/server/app/models/agent.rb b/src/server/app/models/agent.rb
index e4bc055..ea89f0c 100644
--- a/src/server/app/models/agent.rb
+++ b/src/server/app/models/agent.rb
@@ -1,4 +1,11 @@
class Agent < ActiveRecord::Base
+
has_and_belongs_to_many :logtypes, :join_table => :agents_logtypes
has_many :e... |
parabuzzle/cistern | 6e0e739456fb9b8f92d54029ca2c6660b05531d5 | incomplete tests. reference checkin. | diff --git a/src/server/test/fixtures/agents.yml b/src/server/test/fixtures/agents.yml
index 5bf0293..3fe96e0 100644
--- a/src/server/test/fixtures/agents.yml
+++ b/src/server/test/fixtures/agents.yml
@@ -1,7 +1,18 @@
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
# one:
# column: value... |
parabuzzle/cistern | 84361fe57b2d9b4bc1460b3a8d6c5b9a3fa0b306 | Added the peer ip to log entries... will be useful for future security optimizations | diff --git a/src/agent/logsender.rb b/src/agent/logsender.rb
index 2ea9f8d..e1dd34f 100644
--- a/src/agent/logsender.rb
+++ b/src/agent/logsender.rb
@@ -1,27 +1,25 @@
require 'socket'
require 'yaml'
include Socket::Constants
def close_tx(socket)
socket.write("__1_EE")
end
socket = Socket.new( AF_INET, SOCK... |
parabuzzle/cistern | bbeb86b4e1b02d533a48cb9950acb2aa34d22b2f | Changed the models a little so that you can find events based on logtype or agent or the combination. Translation: you can find all events from all logtypes for a specific agent or you can find all events from all agents for a specific logtype or you can find all events for a specific logtype and specific agent. neato | diff --git a/src/server/app/models/agent.rb b/src/server/app/models/agent.rb
index 8914e9c..e4bc055 100644
--- a/src/server/app/models/agent.rb
+++ b/src/server/app/models/agent.rb
@@ -1,3 +1,4 @@
class Agent < ActiveRecord::Base
- has_many :logtypes
+ has_and_belongs_to_many :logtypes, :join_table => :agents_logtyp... |
parabuzzle/cistern | ac18880974d0aec15613807fd9b24a2faf17188b | Proof of concept on the log collector and the database schema. Need to make better delimiters and better concurrent handling | diff --git a/src/server/app/models/logtype.rb b/src/server/app/models/logtype.rb
index b64f5a6..fe561e0 100644
--- a/src/server/app/models/logtype.rb
+++ b/src/server/app/models/logtype.rb
@@ -1,4 +1,4 @@
class Logtype < ActiveRecord::Base
has_many :staticentries
-
+ has_many :events, :through => :staticentries
... |
parabuzzle/cistern | 452bb106b2cbb98491889f2a6085a2c2f1e848f4 | Created the models and still hacking away at the log collection | diff --git a/src/server/app/models/agent.rb b/src/server/app/models/agent.rb
new file mode 100644
index 0000000..8914e9c
--- /dev/null
+++ b/src/server/app/models/agent.rb
@@ -0,0 +1,3 @@
+class Agent < ActiveRecord::Base
+ has_many :logtypes
+end
diff --git a/src/server/app/models/event.rb b/src/server/app/models/eve... |
parabuzzle/cistern | fc950646cb55f74dc747972a61eba4e83960bf88 | generated the event model stubs | diff --git a/src/server/app/models/event.rb b/src/server/app/models/event.rb
new file mode 100644
index 0000000..3a829fd
--- /dev/null
+++ b/src/server/app/models/event.rb
@@ -0,0 +1,2 @@
+class Event < ActiveRecord::Base
+end
diff --git a/src/server/db/migrate/20090721233433_create_events.rb b/src/server/db/migrate/20... |
parabuzzle/cistern | cee1544d094d3e7e71a7bd0c579973a990d05b11 | commented the collector config file | diff --git a/src/server/config/collectors.yml b/src/server/config/collectors.yml
index c42c2b0..0f97992 100644
--- a/src/server/config/collectors.yml
+++ b/src/server/config/collectors.yml
@@ -1,9 +1,26 @@
#should contain all the collector config params
+#UDP log collection configuration
udpcollector:
+ #The UDP... |
parabuzzle/cistern | 8524387d2cc9ceb3507dcfbd90322ae933d39ee3 | log collectors use yaml config file in the config directory now | diff --git a/src/server/config/collectors.yml b/src/server/config/collectors.yml
index 34d47d0..c42c2b0 100644
--- a/src/server/config/collectors.yml
+++ b/src/server/config/collectors.yml
@@ -1 +1,9 @@
-#should contain all the collector config params
\ No newline at end of file
+#should contain all the collector confi... |
parabuzzle/cistern | bc246f04be1f12db53043774fd62082c690a39dd | added license | diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..3383483
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2009 Michael Heijmans
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Softw... |
jstorimer/sinatra-shopify | 696673fb6ca2d47d1aeed10918fb4605540e06c5 | Cleaning up the documentation so it looks pretty on github | diff --git a/README.md b/README.md
index bd2b970..4d2ba06 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,45 @@
Sinatra-Shopify: A classy shopify_app
-====================================
+------------------------------------
-This is a Sinatra extension that allows you to work with the "Shopify API":http://shopi... |
jstorimer/sinatra-shopify | 8aad7d7a4b436f14d332375f5572c6fb07927214 | Add warning if you don't set your API creds | diff --git a/lib/sinatra/shopify.rb b/lib/sinatra/shopify.rb
index 5d0f374..5b8cee2 100644
--- a/lib/sinatra/shopify.rb
+++ b/lib/sinatra/shopify.rb
@@ -1,78 +1,81 @@
require 'sinatra/base'
require 'shopify_api'
module Sinatra
module Shopify
module Helpers
def current_shop
session[:shopif... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.