You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(886) |
Apr
(141) |
May
(30) |
Jun
(86) |
Jul
(23) |
Aug
(33) |
Sep
|
Oct
(21) |
Nov
(30) |
Dec
(811) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(184) |
Feb
(137) |
Mar
(519) |
Apr
(1298) |
May
(180) |
Jun
(71) |
Jul
(35) |
Aug
(90) |
Sep
(48) |
Oct
(86) |
Nov
(159) |
Dec
(55) |
| 2009 |
Jan
(57) |
Feb
(60) |
Mar
(53) |
Apr
(43) |
May
(32) |
Jun
(89) |
Jul
(83) |
Aug
(47) |
Sep
(74) |
Oct
(88) |
Nov
(72) |
Dec
(56) |
| 2010 |
Jan
(33) |
Feb
(20) |
Mar
(17) |
Apr
|
May
(3) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(66) |
Oct
(16) |
Nov
(6) |
Dec
(11) |
| 2011 |
Jan
(6) |
Feb
|
Mar
(49) |
Apr
(5) |
May
(1) |
Jun
(2) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(62) |
Nov
(4) |
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(81) |
Sep
(4) |
Oct
(3) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(8) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(33) |
Jun
(8) |
Jul
|
Aug
|
Sep
(76) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(17) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
|
2
|
3
|
4
|
5
|
|
6
|
7
|
8
|
9
|
10
|
11
|
12
(52) |
|
13
(24) |
14
(21) |
15
(7) |
16
(15) |
17
(24) |
18
|
19
(21) |
|
20
(9) |
21
(7) |
22
|
23
|
24
|
25
|
26
|
|
27
|
28
|
29
|
30
(4) |
31
|
|
|
|
From: Matt <mat...@us...> - 2008-01-30 04:24:40
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6418/devel/ng/openqrm/src/web Modified Files: Makefile Log Message: added include/html dir added test objects to resource-overview Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 21 Jan 2008 19:27:56 -0000 1.5 --- Makefile 30 Jan 2008 04:21:44 -0000 1.6 *************** *** 17,20 **** --- 17,22 ---- . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include . $(OPENQRM_SERVER_CONF) && cp base/include/*.php $$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include/ + . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include/html + . $(OPENQRM_SERVER_CONF) && cp base/include/html/*.php $$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include/html/ echo "Creating the openqrm-client boot-service package" . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service |
|
From: Matt <mat...@us...> - 2008-01-30 04:24:39
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6418/devel/ng/openqrm/src/web/base Modified Files: resource-overview.php Log Message: added include/html dir added test objects to resource-overview Index: resource-overview.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/resource-overview.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resource-overview.php 20 Jan 2008 18:59:58 -0000 1.2 --- resource-overview.php 30 Jan 2008 04:21:44 -0000 1.3 *************** *** 1,4 **** --- 1,9 ---- <?php require_once "include/openqrm-resource-functions.php"; + // using the htmlobject class + require_once "include/html/htmlobject.class.php"; + require_once "include/html/htmlobject_box.class.php"; + require_once "include/html/htmlobject_select.class.php"; + require_once "include/html/htmlobject_textarea.class.php"; echo "Resource overview"; *************** *** 60,63 **** --- 65,114 ---- + echo "<br>"; + echo "html-class tests"; + echo "<br>"; + + + $select = new htmlobject_select(); + $select->id = 'id'; + $select->name = 'name'; + $select->css = 'select'; + $select->tabindex = 1; + $select->title = 'title'; + $select->size = 3; + $select->style = 'white-space:nowrap;'; + $select->multiple = true; + $select->disabled = true; + $select->text = array('1','2','3','4'); + $select->selected = array('3'); + echo $select->get_string(); + + echo "<br>"; + + $textarea = new htmlobject_textarea(); + $textarea->id = 'id'; + $textarea->name = 'name'; + $textarea->css = 'textarea'; + $textarea->tabindex = 1; + $textarea->title = 'title'; + $textarea->size = 3; + $textarea->style = 'white-space:nowrap;'; + $textarea->cols = 10; + $textarea->rows = 10; + $textarea->disabled = true; + $textarea->readonly = true; + $textarea->text = 'text'; + echo $textarea->get_string(); + + echo "<br>"; + + $box = new htmlobject_box(); + $box->label = 'mySelect'; + $box->content = $select->get_string(); + echo $box->get_string(); + + echo "<br>"; + echo "<br>"; + ?> |
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include/html In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29834/devel/ng/openqrm/src/web/base/include/html Added Files: htmlobject.class.php htmlobject_box.class.php htmlobject_textarea.class.php htmlobject_select.class.php Log Message: added html class from Sascha --- NEW FILE: htmlobject_select.class.php --- <?php class htmlobject_select extends htmlobject { /** * disable select * @access private * @var bool */ var $disabled = false; /** * allow multiple selection * @access private * @var bool */ var $multiple = false; /** * Attribute name (should the the same as Attribute id) * @access private * @var string */ var $name = ''; /** * number of lines to be shown * @access private * @var int */ var $size = ''; /** * Attribute tabindex * @access private * @var int */ var $tabindex = ''; /** * content of option element (text) * @access private * @var array */ var $text = array(); /** * content of option element (value) * @access private * @var array */ var $values = array(); /** * selected option of option element * @access private * @var array */ var $selected = array(); /** * selected by text or value * true = selected by text * false = selected by values * @access private * @var bool */ var $selected_by_text = true; /** * internal use only */ var $_disabled; var $_multiple; var $_name; var $_size; var $_tabindex; function init_htmlobject_select() { if ($this->disabled === true) { $this->_disabled = ' disabled'; } if ($this->multiple === true) { $this->_multiple = ' multiple'; } if ($this->name != '') { $this->_name = ' name="'.$this->name.'"'; } if ($this->size != '') { $this->_size = ' size="'.$this->size.'"'; } if ($this->tabindex != '') { $this->_tabindex = ' tabindex="'.$this->tabindex.'"'; } if (count($this->values) == 0) { $this->values = $this->text; } } function get_string() { $this->init_htmlobject(); $this->init_htmlobject_select(); $_strReturn = ' <select'.$this->_id. $this->_name. $this->_css. $this->_tabindex. $this->_title. $this->_style. $this->_size. $this->_multiple. $this->_disabled.'> '; $_strReturn .= $this->get_options(); $_strReturn .= "</select>\n"; return $_strReturn; } function get_options() { $_strReturn = ''; if(count($this->text) > 0){ for ($i=0; count($this->text)>$i; $i++) { $sel = ""; if($this->selected_by_text === true) { if(in_array($this->text[$i], $this->selected)) { $sel = ' selected="selected"'; } } else { if(in_array($this->values[$i], $this->selected)) { $sel = ' selected="selected"'; } } $_strReturn .= "<option value=\"".$this->values[$i]."\"$sel>".$this->text[$i]."</option>\n"; } } else { $_strReturn .= "<option value=\"\" selected=\"selected\" > </option>\n"; } return $_strReturn; } } ?> --- NEW FILE: htmlobject_box.class.php --- <?php class htmlobject_box extends htmlobject { /** * Attribute name (should the the same as Attribute id) * @access private * @var string */ var $label = ''; /** * Attribute name (should the the same as Attribute id) * @access private * @var string */ var $content = ''; /** * Attribute name (should the the same as Attribute id) * @access private * @var string */ var $css_left = ''; /** * Attribute name (should the the same as Attribute id) * @access private * @var string */ var $css_right = ''; function init_htmlobject_box() { if ($this->label == '') { $this->label = ' '; } if ($this->content == '') { $this->content = ' '; } if ($this->css_left != '') { $this->css_left = ' class="'.$this->css_left.'"'; } if ($this->css_right != '') { $this->css_right = ' class="'.$this->css_right.'"'; } } function get_string() { $this->init_htmlobject(); $this->init_htmlobject_box(); $_strReturn = ' <table'.$this->id. $this->name. $this->css. $this->style. $this->title.'> <tr> <td'.$this->css_left.'>'.$this->label.'</td> <td'.$this->css_right.'>'.$this->content.'</td> </tr> </table> '; return $_strReturn; } } ?> --- NEW FILE: htmlobject.class.php --- <?php class htmlobject { /** * Attribute class * @access private * @var string */ var $css = ''; /** * Attribute id * @access private * @var string */ var $id = ''; /** * Attribute style * @access private * @var string */ var $style = ''; /** * Attribute title * @access private * @var string */ var $title = ''; /** * internal use only */ var $_css; var $_id; var $_style; var $_title; function init_htmlobject() { if ($this->css != '') { $this->_css = ' class="'.$this->css.'"'; } if ($this->id != '') { $this->_id = ' id="'.$this->id.'"'; } if ($this->style != '') { $this->_style = ' style="'.$this->style.'"'; } if ($this->title != '') { $this->_title = ' title="'.$this->title.'"'; } } } ?> --- NEW FILE: htmlobject_textarea.class.php --- <?php class htmlobject_textarea extends htmlobject { /** * Attribute cols * @access private * @var int */ var $cols = ''; /** * disable textarea * @access private * @var bool */ var $disabled = false; /** * Attribute name (should the the same as Attribute id) * @access private * @var string */ var $name = ''; /** * set textarea to readonly * @access private * @var bool */ var $readonly = false; /** * number of rows * @access private * @var int */ var $rows = array(); /** * Attribute tabindex * @access private * @var int */ var $tabindex = ''; /** * wrap type (physical,virtual,none) * @access private * @var string */ var $wrap = ''; /** * Content of textarea * @access private * @var string */ var $text = ''; /** * internal use only */ var $_cols; var $_disabled; var $_name; var $_readonly; var $_rows; var $_tabindex; var $_wrap; function init_htmlobject_textarea() { if ($this->cols != '') { $this->_cols = ' cols="'.$this->cols.'"'; } if ($this->disabled === true) { $this->_disabled = ' disabled'; } if ($this->name != '') { $this->_name = ' name="'.$this->name.'"'; } if ($this->readonly === true) { $this->_readonly = ' readonly'; } if ($this->rows != '') { $this->_rows = ' rows="'.$this->rows.'"'; } if ($this->tabindex != '') { $this->_tabindex = ' tabindex="'.$this->tabindex.'"'; } if ($this->wrap != '') { $this->_wrap = ' wrap="'.$this->wrap.'"'; } } function get_string() { $this->init_htmlobject(); $this->init_htmlobject_textarea(); $_strReturn = ' <textarea'.$this->_id. $this->_name. $this->_css. $this->_title. $this->_style. $this->_cols. $this->_disabled. $this->_readonly. $this->_rows. $this->_tabindex. $this->_wrap.'>'; $_strReturn .= $this->text; $_strReturn .= "</textarea>\n"; return $_strReturn; } } ?> |
|
From: Matt <mat...@us...> - 2008-01-30 03:58:38
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include/html In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29823/devel/ng/openqrm/src/web/base/include/html Log Message: Directory /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include/html added to the repository |
|
From: Matt <mat...@us...> - 2008-01-21 19:27:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12436/devel/ng/openqrm/src/web Modified Files: Makefile Log Message: added basic monitoring framework Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 19 Jan 2008 19:38:01 -0000 1.4 --- Makefile 21 Jan 2008 19:27:56 -0000 1.5 *************** *** 23,26 **** --- 23,27 ---- . $(OPENQRM_SERVER_CONF) && cp -a ../sbin/openqrm-execd $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/ . $(OPENQRM_SERVER_CONF) && cp -a ../sbin/openqrm-exec-port-monitor $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/ + . $(OPENQRM_SERVER_CONF) && cp -a ../sbin/openqrm-monitord $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/ . $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/* . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/include |
|
From: Matt <mat...@us...> - 2008-01-21 19:27:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/sbin In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12436/devel/ng/openqrm/src/sbin Modified Files: Makefile openqrm-execd Added Files: openqrm-monitord Log Message: added basic monitoring framework Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/sbin/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 19 Jan 2008 18:14:19 -0000 1.2 --- Makefile 21 Jan 2008 19:27:55 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- . $(OPENQRM_SERVER_CONF) && cp -a openqrm-execd $$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/ . $(OPENQRM_SERVER_CONF) && cp -a openqrm-exec-port-monitor $$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/ + . $(OPENQRM_SERVER_CONF) && cp -a openqrm-monitord $$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/ . $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm* --- NEW FILE: openqrm-monitord --- #!/bin/bash # openqrm-monitord, a openQRM daemon for gathering system statistics OPENQRM_SBIN_DIR=`dirname $0` OPENQRM_BASE_DIR=`pushd $OPENQRM_SBIN_DIR/.. 1>/dev/null && pwd && popd 1>/dev/null` OPENQRM_EVENT="statistics" OPENQRM_STATE="active" # check if running on the server or on a managed resource if [ -f "$OPENQRM_BASE_DIR/include/openqrm-server-functions" ]; then # we are running on the server . $OPENQRM_BASE_DIR/include/openqrm-functions . $OPENQRM_BASE_DIR/include/openqrm-server-functions export resource_id=0 export resource_senddelay=30 export resource_openqrmserver=$OPENQRM_SERVER_IP_ADDRESS else # we are running on a managed resource export OPENQRM_SERVER_BASE_DIR=$OPENQRM_BASE_DIR . $OPENQRM_BASE_DIR/include/openqrm-functions . $OPENQRM_RESOURCE_PARAMETER_FILE fi # local used functions function urlencodechar() { # notice : "%", "*" and "\" are not supported UCHAR=$1 UCHAR=${UCHAR/\~/%7E} UCHAR=${UCHAR/\!/%21} UCHAR=${UCHAR/\@/%40} UCHAR=${UCHAR/\\#/%23} UCHAR=${UCHAR/\\$/%24} #UCHAR=${UCHAR/\%/%25} UCHAR=${UCHAR/\^/%5E} UCHAR=${UCHAR/\&/%26} #UCHAR=${UCHAR/\\*/%2A} UCHAR=${UCHAR/\(/%28} UCHAR=${UCHAR/\)/%29} UCHAR=${UCHAR/\+/%2B} UCHAR=${UCHAR/\|/%7C} UCHAR=${UCHAR/\{/%7B} UCHAR=${UCHAR/\}/%7D} UCHAR=${UCHAR/\:/%3A} UCHAR=${UCHAR/\"/%22} UCHAR=${UCHAR/\</%3C} UCHAR=${UCHAR/\>/%3E} UCHAR=${UCHAR/\\?/%3F} UCHAR=${UCHAR/\`/%60} UCHAR=${UCHAR/\=/%3D} #UCHAR=${UCHAR/\\/%5C} UCHAR=${UCHAR/\[/%5B} UCHAR=${UCHAR/\]/%5D} UCHAR=${UCHAR/\;/%3B} UCHAR=${UCHAR/\'/%27} UCHAR=${UCHAR/\,/%2C} UCHAR=${UCHAR/\//%2F} # whitespace if [ -z $UCHAR ]; then UCHAR=%20 fi echo "$UCHAR" } function urlencodestring() { USERINPUT=$@ LENGTH=${#USERINPUT} for (( LOOP=0; LOOP<$LENGTH; LOOP++ )); do TESTCHAR=`echo ${USERINPUT:$LOOP:1}` TESTCHAR=`urlencodechar $TESTCHAR` echo -n $TESTCHAR done } function send_info() { current_state=`urlencodestring $OPENQRM_STATE` current_event=`urlencodestring $OPENQRM_EVENT` MESSAGEDATA="resource_id=$resource_id&resource_uptime=$current_uptime&resource_cpunumber=$current_cpu_number&resource_cpuspeed=$current_cpu_speed&resource_cpumodel=$current_cpu_model&resource_memtotal=$current_mem_total&resource_memused=$current_mem_used&resource_swaptotal=$current_swap_total&resource_swapused=$current_swap_used&resource_hostname=$current_hostname&resource_load=$current_cpu_load&resource_state=$current_state&resource_event=$current_event&resource_capabilities=$dyn_current_resource_capabilities"; OPENQRM_RESOURCE_INFO_URL="http://$resource_openqrmserver/openqrm/action/resource-action.php?resource_command=update_info&$MESSAGEDATA" wget -q -O /dev/null "$OPENQRM_RESOURCE_INFO_URL" } # converts bytes to mega-bytes function bytes_to_mega() { echo $1 | awk '{printf("%.0f", $1 / 1024/ 1024)}' } # statistic gathering functions # uptime function find_uptime() { current_uptime=`cat /proc/uptime | cut -d'.' -f 1` if [ -z "$current_uptime" ]; then current_uptime=0 fi } # cpu_number function find_cpu_number() { current_cpu_number=`grep '^cpu[0-9]' /proc/stat | wc -l` current_cpu_number=${current_cpu_number// /} if [ -z "$current_cpu_number" ]; then current_cpu_number=0 fi } # cpu_speed function find_cpu_speed() { current_cpu_speed=(`cat /proc/cpuinfo | grep "cpu.*MHz"`) current_cpu_speed=${current_cpu_speed[3]/\.*/} if [ -z "$current_cpu_speed" ]; then current_cpu_speed=0 fi } # cpu_model function find_cpu_model() { current_cpu_model=`cat /proc/cpuinfo | grep "model.*name" | head -n 1 | tr -s ' ' | cut -d' ' -f 3-` current_cpu_model=`urlencodestring $current_cpu_model` if [ -z "current_cpu_model" ]; then current_cpu_model=0 fi } # mem_total function find_mem_total() { current_mem_total=`cat /proc/meminfo | awk '/MemTotal:/ { print int($2/1024) };'` } # mem_used function find_mem_used() { if [ -z "$current_mem_total" ]; then current_mem_total=`cat /proc/meminfo | awk '/MemTotal:/ { print int($2/1024) };'` fi current_mem_free=`cat /proc/meminfo | awk '/MemFree:/ { print int($2/1024) };'` current_mem_used=$((current_mem_total - current_mem_free)) if [ -z "$current_mem_used" ]; then current_mem_used=0 fi } # swap_total function find_swap_total() { current_swap_total=`cat /proc/meminfo | awk '/SwapTotal:/ { print int($2/1024) };'` } # swap_used function find_swap_used() { if [ -z "$current_swap_total" ]; then current_swap_total=`cat /proc/meminfo | awk '/SwapTotal:/ { print int($2/1024) };'` fi current_swap_free=`cat /proc/meminfo | awk '/SwapFree:/ { print int($2/1024) };'` current_swap_used=$((current_swap_total - current_swap_free)) if [ -z "$current_swap_used" ]; then current_swap_used=0 fi } # hostname function find_hostname() { current_hostname=`hostname` current_hostname=`urlencodestring $current_hostname` if [ -z "$current_hostname" ]; then current_hostname=0 fi } # cpu_load function find_cpu_load() { current_cpu_load=`cat /proc/loadavg | cut -d' ' -f 1` if [ -z "$current_cpu_load" ]; then current_cpu_load=0 fi } # start after /proc is mounted while [ ! -f /proc/cpuinfo ]; do sleep 5 done # gathering the static values echo "$0: Gathering resources-information" | logger # cpu_number find_cpu_number # cpu_speed find_cpu_speed # cpu_model find_cpu_model # mem_total find_mem_total # main loop while (true); do # uptime find_uptime # mem_used find_mem_used # swap_total find_swap_total # swap_used find_swap_used # hostname find_hostname # cpu_load find_cpu_load # sending statistics send_info # delay sleep $resource_senddelay done # never reached exit 0 Index: openqrm-execd =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/sbin/openqrm-execd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openqrm-execd 19 Jan 2008 18:14:19 -0000 1.1 --- openqrm-execd 21 Jan 2008 19:27:56 -0000 1.2 *************** *** 12,16 **** else # we are running on a managed resource ! OPENQRM_RESOURCE_PARAMETER_FILE="/var/openqrm/openqrm-resource.conf" . $OPENQRM_RESOURCE_PARAMETER_FILE OPENQRM_SERVER_IP_ADDRESS=$resource_openqrmserver --- 12,17 ---- else # we are running on a managed resource ! export OPENQRM_SERVER_BASE_DIR=$OPENQRM_BASE_DIR ! . $OPENQRM_BASE_DIR/include/openqrm-functions . $OPENQRM_RESOURCE_PARAMETER_FILE OPENQRM_SERVER_IP_ADDRESS=$resource_openqrmserver |
|
From: Matt <mat...@us...> - 2008-01-21 19:27:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12436/devel/ng/openqrm/src Modified Files: Changelog Log Message: added basic monitoring framework Index: Changelog =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/Changelog,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Changelog 20 Jan 2008 18:59:58 -0000 1.7 --- Changelog 21 Jan 2008 19:27:56 -0000 1.8 *************** *** 16,17 **** --- 16,18 ---- 20.1.2008 - Matt - cleaned-up init process on the initrd made reboot/halt working + 21.1.2008 - Matt - added basic monitoring framework \ No newline at end of file |
|
From: Matt <mat...@us...> - 2008-01-21 19:27:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12436/devel/ng/openqrm/src/etc/templates Modified Files: openqrm-linuxrc Log Message: added basic monitoring framework Index: openqrm-linuxrc =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates/openqrm-linuxrc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** openqrm-linuxrc 20 Jan 2008 18:59:58 -0000 1.8 --- openqrm-linuxrc 21 Jan 2008 19:27:56 -0000 1.9 *************** *** 60,69 **** # this will add the resource to the openQRM-server echo "New resource detected ! Adding to the openQRM-server at $OPENQRM_SERVER_IP_ADDRESS" ! wget -O /dev/null "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-action.php?resource_command=new_resource&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS&resource_ip=$OPENQRM_RESOURCE_IP_ADDRESS&resource_id=$id" fi # get resource parameter echo "Getting resource-parameters ..." ! wget -O $OPENQRM_RESOURCE_PARAMETER_FILE "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-action.php?resource_command=get_parameter&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS" . $OPENQRM_RESOURCE_PARAMETER_FILE --- 60,69 ---- # this will add the resource to the openQRM-server echo "New resource detected ! Adding to the openQRM-server at $OPENQRM_SERVER_IP_ADDRESS" ! wget -q -O /dev/null "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-action.php?resource_command=new_resource&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS&resource_ip=$OPENQRM_RESOURCE_IP_ADDRESS&resource_id=$id" fi # get resource parameter echo "Getting resource-parameters ..." ! wget -q -O $OPENQRM_RESOURCE_PARAMETER_FILE "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-action.php?resource_command=get_parameter&resource_mac=$OPENQRM_RESOURCE_MAC_ADDRESS" . $OPENQRM_RESOURCE_PARAMETER_FILE *************** *** 79,83 **** echo "Getting openqrm-client package" cd / ! wget "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz" tar -xzf openqrm-client.tgz rm -f openqrm-client.tgz --- 79,83 ---- echo "Getting openqrm-client package" cd / ! wget -q "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz" tar -xzf openqrm-client.tgz rm -f openqrm-client.tgz *************** *** 86,90 **** # send idle/available echo "Sending idle/available to openQRM-server at $OPENQRM_SERVER_IP_ADDRESS" ! wget -O /dev/null "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-action.php?resource_command=update_status&resource_id=$resource_id&resource_state=idle&resource_event=available" # rcs0 will be started here from init --- 86,90 ---- # send idle/available echo "Sending idle/available to openQRM-server at $OPENQRM_SERVER_IP_ADDRESS" ! wget -q -O /dev/null "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-action.php?resource_command=update_status&resource_id=$resource_id&resource_state=idle&resource_event=available" # rcs0 will be started here from init |
|
From: Matt <mat...@us...> - 2008-01-21 19:27:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/init.d In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12436/devel/ng/openqrm/src/etc/init.d Modified Files: openqrm-server openqrm-client Log Message: added basic monitoring framework Index: openqrm-server =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/init.d/openqrm-server,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** openqrm-server 19 Jan 2008 18:14:23 -0000 1.8 --- openqrm-server 21 Jan 2008 19:27:56 -0000 1.9 *************** *** 152,157 **** # start the openqrm-execd daemon $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-exec-port-monitor $OPENQRM_SERVER_IP_ADDRESS $OPENQRM_EXEC_PORT | $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-execd & ! ! touch ${LOCKFILE} --- 152,157 ---- # start the openqrm-execd daemon $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-exec-port-monitor $OPENQRM_SERVER_IP_ADDRESS $OPENQRM_EXEC_PORT | $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-execd & ! # and the monitoring infra-structure ! $OPENQRM_SERVER_BASE_DIR/openqrm/sbin/openqrm-monitord & touch ${LOCKFILE} *************** *** 174,177 **** --- 174,178 ---- killall openqrm-exec-port-monitor 1>/dev/null 2>&1 killall openqrm-execd 1>/dev/null 2>&1 + killall openqrm-monitord 1>/dev/null 2>&1 /bin/rm -f ${LOCKFILE} } Index: openqrm-client =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/init.d/openqrm-client,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** openqrm-client 19 Jan 2008 19:38:01 -0000 1.2 --- openqrm-client 21 Jan 2008 19:27:56 -0000 1.3 *************** *** 34,38 **** # start openqrm-execd $resource_basedir/openqrm/sbin/openqrm-exec-port-monitor $resource_ip $resource_execdport | $resource_basedir/openqrm/sbin/openqrm-execd & ! touch ${LOCKFILE} } --- 34,39 ---- # start openqrm-execd $resource_basedir/openqrm/sbin/openqrm-exec-port-monitor $resource_ip $resource_execdport | $resource_basedir/openqrm/sbin/openqrm-execd & ! # start openqrm-monitord ! $resource_basedir/openqrm/sbin/openqrm-monitord & touch ${LOCKFILE} } *************** *** 44,47 **** --- 45,49 ---- killall openqrm-exec-port-monitor 1>/dev/null 2>&1 killall openqrm-execd 1>/dev/null 2>&1 + killall openqrm-monitord 1>/dev/null 2>&1 /bin/rm -f ${LOCKFILE} } |
|
From: Matt <mat...@us...> - 2008-01-21 19:27:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/action In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12436/devel/ng/openqrm/src/web/action Modified Files: resource-action.php Log Message: added basic monitoring framework Index: resource-action.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/action/resource-action.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** resource-action.php 20 Jan 2008 18:59:58 -0000 1.3 --- resource-action.php 21 Jan 2008 19:27:56 -0000 1.4 *************** *** 10,13 **** --- 10,18 ---- $resource_state = $_REQUEST["resource_state"]; $resource_event = $_REQUEST["resource_event"]; + foreach ($_REQUEST as $key => $value) { + if (strncmp($key, "resource_", 9) == 0) { + $resource_fields[$key] = $value; + } + } |
|
From: Matt <mat...@us...> - 2008-01-21 19:27:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12436/devel/ng/openqrm/src/web/base/include Modified Files: openqrm-resource-functions.php Log Message: added basic monitoring framework Index: openqrm-resource-functions.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include/openqrm-resource-functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** openqrm-resource-functions.php 20 Jan 2008 18:59:57 -0000 1.3 --- openqrm-resource-functions.php 21 Jan 2008 19:27:56 -0000 1.4 *************** *** 185,190 **** function openqrm_update_resource_info($resource_id, $resource_fields) { global $RESOURCE_INFO_TABLE; ! if ($resource_id < 0 || ! is_array($resource_fields)) { ! print("Unable to update resource $resource_id"); return 1; } --- 185,190 ---- function openqrm_update_resource_info($resource_id, $resource_fields) { global $RESOURCE_INFO_TABLE; ! if (! is_array($resource_fields)) { ! print("ERROR: Unable to update resource $resource_id"); return 1; } |
|
From: Matt <mat...@us...> - 2008-01-20 19:00:28
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29936/devel/ng/openqrm/src/web/base Modified Files: resource-overview.php Log Message: cleaned up init on initrd made reboot + halt working Index: resource-overview.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/resource-overview.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** resource-overview.php 19 Jan 2008 18:14:23 -0000 1.1 --- resource-overview.php 20 Jan 2008 18:59:58 -0000 1.2 *************** *** 49,52 **** --- 49,60 ---- print_r($OPENQRM_RESOURCE_LIST); + $resource_ip=$OPENQRM_RESOURCE_LIST[1][resource_ip] ; + + echo "ip = $resource_ip"; + echo "<br>"; + echo "<a href=\"../action/resource-action.php?resource_command=reboot&resource_ip=$resource_ip\">reboot</a>"; + echo "<br>"; + echo "<a href=\"../action/resource-action.php?resource_command=halt&resource_ip=$resource_ip\">halt</a>"; + echo "<br>"; |
|
From: Matt <mat...@us...> - 2008-01-20 19:00:28
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29936/devel/ng/openqrm/src/etc/templates Modified Files: openqrm-linuxrc Log Message: cleaned up init on initrd made reboot + halt working Index: openqrm-linuxrc =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates/openqrm-linuxrc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** openqrm-linuxrc 20 Jan 2008 18:00:18 -0000 1.7 --- openqrm-linuxrc 20 Jan 2008 18:59:58 -0000 1.8 *************** *** 77,80 **** --- 77,81 ---- # run default openqrm-client boot-service + echo "Getting openqrm-client package" cd / wget "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz" *************** *** 83,86 **** --- 84,91 ---- $resource_basedir/openqrm/etc/init.d/openqrm-client start + # send idle/available + echo "Sending idle/available to openQRM-server at $OPENQRM_SERVER_IP_ADDRESS" + wget -O /dev/null "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/action/resource-action.php?resource_command=update_status&resource_id=$resource_id&resource_state=idle&resource_event=available" + # rcs0 will be started here from init |
|
From: Matt <mat...@us...> - 2008-01-20 19:00:28
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29936/devel/ng/openqrm/src Modified Files: Changelog Log Message: cleaned up init on initrd made reboot + halt working Index: Changelog =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/Changelog,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Changelog 19 Jan 2008 19:38:02 -0000 1.6 --- Changelog 20 Jan 2008 18:59:58 -0000 1.7 *************** *** 13,15 **** 19.1.2008 - Matt - added root-execution environemnt for the server added to add new detected resources automatically ! added starting the openrm-client on the booted resources \ No newline at end of file --- 13,17 ---- 19.1.2008 - Matt - added root-execution environemnt for the server added to add new detected resources automatically ! added starting the openrm-client on the booted resources ! 20.1.2008 - Matt - cleaned-up init process on the initrd ! made reboot/halt working |
|
From: Matt <mat...@us...> - 2008-01-20 19:00:28
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/sbin In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29936/devel/ng/openqrm/src/sbin Modified Files: openqrm-exec-port-monitor.c Log Message: cleaned up init on initrd made reboot + halt working Index: openqrm-exec-port-monitor.c =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/sbin/openqrm-exec-port-monitor.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openqrm-exec-port-monitor.c 19 Jan 2008 18:14:19 -0000 1.1 --- openqrm-exec-port-monitor.c 20 Jan 2008 18:59:57 -0000 1.2 *************** *** 81,85 **** fflush(stderr); } ! buf[msgsize -2 ] = '\0'; printf("%s:%s\n",inet_ntoa(peer.sin_addr.s_addr), buf); close(fd); --- 81,88 ---- fflush(stderr); } ! if (buf[msgsize - 1] == '\n') { ! msgsize--; ! } ! buf[msgsize] = '\0'; printf("%s:%s\n",inet_ntoa(peer.sin_addr.s_addr), buf); close(fd); |
|
From: Matt <mat...@us...> - 2008-01-20 19:00:27
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/action In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29936/devel/ng/openqrm/src/web/action Modified Files: resource-action.php Log Message: cleaned up init on initrd made reboot + halt working Index: resource-action.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/action/resource-action.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resource-action.php 19 Jan 2008 18:14:23 -0000 1.2 --- resource-action.php 20 Jan 2008 18:59:58 -0000 1.3 *************** *** 8,11 **** --- 8,14 ---- $resource_mac = $_REQUEST["resource_mac"]; $resource_ip = $_REQUEST["resource_ip"]; + $resource_state = $_REQUEST["resource_state"]; + $resource_event = $_REQUEST["resource_event"]; + $OPENQRM_SERVER_IP_ADDRESS=openqrm_server_get_ip_address(); *************** *** 14,20 **** switch ($resource_command) { ! # new_resource needs : ! # resource_mac ! # resource_ip case 'new_resource': if (openqrm_resource_exists($resource_mac)) { --- 17,23 ---- switch ($resource_command) { ! // new_resource needs : ! // resource_mac ! // resource_ip case 'new_resource': if (openqrm_resource_exists($resource_mac)) { *************** *** 49,55 **** break; ! # remove requires : ! # resource_id ! # resouce_mac case 'remove': $fp = fsockopen($OPENQRM_SERVER_IP_ADDRESS, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); --- 52,58 ---- break; ! // remove requires : ! // resource_id ! // resouce_mac case 'remove': $fp = fsockopen($OPENQRM_SERVER_IP_ADDRESS, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); *************** *** 67,73 **** break; ! # localboot requires : ! # resource_id ! # resource_mac case 'localboot': $fp = fsockopen($OPENQRM_SERVER_IP_ADDRESS, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); --- 70,76 ---- break; ! // localboot requires : ! // resource_id ! // resource_mac case 'localboot': $fp = fsockopen($OPENQRM_SERVER_IP_ADDRESS, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); *************** *** 83,89 **** break; ! # netboot requires : ! # resource_id ! # resource_mac case 'netboot': $fp = fsockopen($OPENQRM_SERVER_IP_ADDRESS, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); --- 86,92 ---- break; ! // netboot requires : ! // resource_id ! // resource_mac case 'netboot': $fp = fsockopen($OPENQRM_SERVER_IP_ADDRESS, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); *************** *** 99,110 **** break; ! # assign requires : ! # resource_id ! # resource_mac ! # resource_ip ! # kernel_id ! # kernel_name ! # image_id ! # image_name case 'assign': --- 102,113 ---- break; ! // assign requires : ! // resource_id ! // resource_mac ! // resource_ip ! // kernel_id ! // kernel_name ! // image_id ! // image_name case 'assign': *************** *** 136,141 **** break; ! # get_parameter requires : ! # resource_mac case 'get_parameter': if (strlen($resource_mac)) { --- 139,144 ---- break; ! // get_parameter requires : ! // resource_mac case 'get_parameter': if (strlen($resource_mac)) { *************** *** 146,152 **** break; ! # update_info requires : ! # resource_id ! # array of resource_fields case 'update_info': if (strlen($resource_id)) { --- 149,155 ---- break; ! // update_info requires : ! // resource_id ! // array of resource_fields case 'update_info': if (strlen($resource_id)) { *************** *** 156,163 **** break; ! # update_status requires : ! # resource_id ! # resource_state ! # resource_event case 'update_status': if (strlen($resource_id)) { --- 159,166 ---- break; ! // update_status requires : ! // resource_id ! // resource_state ! // resource_event case 'update_status': if (strlen($resource_id)) { *************** *** 168,173 **** ! # reboot requires : ! # resource_ip case 'reboot': $fp = fsockopen($resource_ip, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); --- 171,176 ---- ! // reboot requires : ! // resource_ip case 'reboot': $fp = fsockopen($resource_ip, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); *************** *** 181,187 **** ! # shutdown requires : ! # resource_ip ! case 'shutdown': $fp = fsockopen($resource_ip, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); if(!$fp) { --- 184,190 ---- ! // halt requires : ! // resource_ip ! case 'halt': $fp = fsockopen($resource_ip, $OPENQRM_EXEC_PORT, $errno, $errstr, 30); if(!$fp) { *************** *** 189,198 **** exit(); } ! fputs($fp,"shutdown"); fclose($fp); break; ! # list requires : ! # nothing case 'list': $resource_list = openqrm_get_resource_list(); --- 192,201 ---- exit(); } ! fputs($fp,"halt"); fclose($fp); break; ! // list requires : ! // nothing case 'list': $resource_list = openqrm_get_resource_list(); |
|
From: Matt <mat...@us...> - 2008-01-20 19:00:27
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29936/devel/ng/openqrm/src/web/base/include Modified Files: openqrm-database-functions.php openqrm-resource-functions.php Log Message: cleaned up init on initrd made reboot + halt working Index: openqrm-database-functions.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include/openqrm-database-functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** openqrm-database-functions.php 19 Jan 2008 18:14:19 -0000 1.2 --- openqrm-database-functions.php 20 Jan 2008 18:59:57 -0000 1.3 *************** *** 74,77 **** - ?> --- 74,76 ---- Index: openqrm-resource-functions.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include/openqrm-resource-functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** openqrm-resource-functions.php 19 Jan 2008 19:38:01 -0000 1.2 --- openqrm-resource-functions.php 20 Jan 2008 18:59:57 -0000 1.3 *************** *** 202,207 **** function openqrm_update_resource_status($resource_id, $resource_state, $resource_event) { global $RESOURCE_INFO_TABLE; - set_default($resource_state,0); - set_default($resource_event,0); $db=openqrm_get_db_connection(); $query = "update $RESOURCE_INFO_TABLE set --- 202,205 ---- |
|
From: Matt <mat...@us...> - 2008-01-20 18:00:14
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6213/devel/ng/openqrm/src/include Modified Files: openqrm-build-functions Log Message: cleaned up init on the initrd made reboot working Index: openqrm-build-functions =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/include/openqrm-build-functions,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** openqrm-build-functions 17 Jan 2008 17:59:31 -0000 1.8 --- openqrm-build-functions 20 Jan 2008 18:00:18 -0000 1.9 *************** *** 240,243 **** --- 240,250 ---- done done + # fix reboot for the initrd -> reboot -f (it's simply faster) + rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/reboot + cat >> $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/reboot << EOF + #!/bin/bash + /bin/busybox reboot -f + EOF + chmod +x $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/sbin/reboot # creating initrd directories for DIR in $OPENQRM_INITRD_DIRECTORIES; do *************** *** 277,296 **** # create rcS cat >> $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/rc.d/init.d/rcS << EOF #!/bin/bash export SHELL=/bin/bash - echo "openQRM resource is starting rcS" > /dev/console - export \$(eval cat /proc/cmdline) ! ! if [ -f /reboot ]; then ! echo "openQRM resource is rebooting now" ! /sbin/reboot ! fi ! ! if [ -f /halt ]; then ! echo "openQRM resource is shutting down now" ! /sbin/halt ! fi EOF --- 284,293 ---- # create rcS + rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/rc.d/init.d/rcS cat >> $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/rc.d/init.d/rcS << EOF #!/bin/bash export SHELL=/bin/bash export \$(eval cat /proc/cmdline) ! echo "openQRM resource \$id is starting rcS" > /dev/console EOF *************** *** 298,301 **** --- 295,299 ---- # create inittab + rm -f $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/inittab cat >> $OPENQRM_BUILD_TMP_DIR/openqrm-build/initroot/etc/inittab << EOF *************** *** 306,310 **** tty4::askfirst:-/bin/bash ::sysinit:/etc/init.d/rcS ! ::restart:/sbin/init # Stuff to do before rebooting --- 304,308 ---- tty4::askfirst:-/bin/bash ::sysinit:/etc/init.d/rcS ! ::restart:/sbin/reboot # Stuff to do before rebooting |
|
From: Matt <mat...@us...> - 2008-01-20 18:00:14
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6213/devel/ng/openqrm/src/etc/templates Modified Files: openqrm-linuxrc Log Message: cleaned up init on the initrd made reboot working Index: openqrm-linuxrc =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates/openqrm-linuxrc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** openqrm-linuxrc 19 Jan 2008 19:38:01 -0000 1.6 --- openqrm-linuxrc 20 Jan 2008 18:00:18 -0000 1.7 *************** *** 83,88 **** $resource_basedir/openqrm/etc/init.d/openqrm-client start ! /bin/bash ! --- 83,87 ---- $resource_basedir/openqrm/etc/init.d/openqrm-client start ! # rcs0 will be started here from init |
|
From: Matt <mat...@us...> - 2008-01-20 17:59:26
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/build.conf In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5816/devel/ng/openqrm/src/etc/build.conf Modified Files: initrd-devices.conf Log Message: added more tty's Index: initrd-devices.conf =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/build.conf/initrd-devices.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** initrd-devices.conf 16 Jan 2008 16:02:34 -0000 1.1 --- initrd-devices.conf 20 Jan 2008 17:59:30 -0000 1.2 *************** *** 7,11 **** /dev/mem c 666 0 0 1 1 - - - /dev/ram b 660 0 0 1 1 1 1 4 ! /dev/tty c 660 0 0 4 0 0 1 5 /dev/root b 660 0 0 0 255 0 0 - /dev/nfs b 660 0 0 0 255 0 0 - --- 7,11 ---- /dev/mem c 666 0 0 1 1 - - - /dev/ram b 660 0 0 1 1 1 1 4 ! /dev/tty c 660 0 0 4 0 0 1 10 /dev/root b 660 0 0 0 255 0 0 - /dev/nfs b 660 0 0 0 255 0 0 - |
|
From: Matt <mat...@us...> - 2008-01-19 19:37:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13430/devel/ng/openqrm/src/web Modified Files: Makefile Log Message: added starting the openqrm-client on the booted resources Index: Makefile =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 17 Jan 2008 21:59:36 -0000 1.3 --- Makefile 19 Jan 2008 19:38:01 -0000 1.4 *************** *** 17,20 **** --- 17,35 ---- . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include . $(OPENQRM_SERVER_CONF) && cp base/include/*.php $$OPENQRM_SERVER_BASE_DIR/openqrm/web/base/include/ + echo "Creating the openqrm-client boot-service package" + . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service + . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm + . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin + . $(OPENQRM_SERVER_CONF) && cp -a ../sbin/openqrm-execd $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/ + . $(OPENQRM_SERVER_CONF) && cp -a ../sbin/openqrm-exec-port-monitor $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/ + . $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/sbin/* + . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/include + . $(OPENQRM_SERVER_CONF) && cp -a ../include/openqrm-functions $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/include/ + . $(OPENQRM_SERVER_CONF) && mkdir -p $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/etc/init.d/ + . $(OPENQRM_SERVER_CONF) && cp -a ../etc/init.d/openqrm-client $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/etc/init.d/ + . $(OPENQRM_SERVER_CONF) && chmod +x $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/$$OPENQRM_RESOURCE_BASE_DIR/openqrm/etc/init.d/* + . $(OPENQRM_SERVER_CONF) && tar -C $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client/ -czf $$OPENQRM_SERVER_BASE_DIR/openqrm/web/boot-service/openqrm-client.tgz `echo $$OPENQRM_RESOURCE_BASE_DIR | cut -d'/' -f2-` + rm -rf $$OPENQRM_BUILD_TMP_DIR/openqrm-build/openqrm-client + uninstall: |
|
From: Matt <mat...@us...> - 2008-01-19 19:37:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13430/devel/ng/openqrm/src/web/base/include Modified Files: openqrm-resource-functions.php Log Message: added starting the openqrm-client on the booted resources Index: openqrm-resource-functions.php =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/web/base/include/openqrm-resource-functions.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openqrm-resource-functions.php 19 Jan 2008 18:14:19 -0000 1.1 --- openqrm-resource-functions.php 19 Jan 2008 19:38:01 -0000 1.2 *************** *** 2,5 **** --- 2,7 ---- require_once "openqrm-database-functions.php"; + require_once "openqrm-server-functions.php"; + global $RESOURCE_INFO_TABLE; *************** *** 63,68 **** global $OPENQRM_EXEC_PORT; global $RESOURCE_INFO_TABLE; $db=openqrm_get_db_connection(); ! $rs = $db->Execute("insert into $RESOURCE_INFO_TABLE (resource_id, resource_localboot, resource_kernel, resource_kernelid, resource_image, resource_imageid, resource_openqrmserver, resource_basedir, resource_serverid, resource_ip, resource_subnet, resource_broadcast, resource_network, resource_mac, resource_uptime, resource_cpunumber, resource_cpuspeed, resource_cpumodel, resource_memtotal, resource_memused, resource_swaptotal, resource_swapused, resource_hostname, resource_load, resource_execdport, resource_senddelay, resource_state, resource_event) values ($resource_id, 0, 'default', 1, 'idle', 1, '', '', 1, '$resource_ip', '', '', '', '$resource_mac', 0, 0, 0, '0', 0, 0, 0, 0, 'idle', 0, $OPENQRM_EXEC_PORT, 30, 'booting', 'detected')"); } --- 65,72 ---- global $OPENQRM_EXEC_PORT; global $RESOURCE_INFO_TABLE; + global $OPENQRM_RESOURCE_BASE_DIR; + $OPENQRM_SERVER_IP_ADDRESS=openqrm_server_get_ip_address(); $db=openqrm_get_db_connection(); ! $rs = $db->Execute("insert into $RESOURCE_INFO_TABLE (resource_id, resource_localboot, resource_kernel, resource_kernelid, resource_image, resource_imageid, resource_openqrmserver, resource_basedir, resource_serverid, resource_ip, resource_subnet, resource_broadcast, resource_network, resource_mac, resource_uptime, resource_cpunumber, resource_cpuspeed, resource_cpumodel, resource_memtotal, resource_memused, resource_swaptotal, resource_swapused, resource_hostname, resource_load, resource_execdport, resource_senddelay, resource_state, resource_event) values ($resource_id, 0, 'default', 1, 'idle', 1, '$OPENQRM_SERVER_IP_ADDRESS', '$OPENQRM_RESOURCE_BASE_DIR', 1, '$resource_ip', '', '', '', '$resource_mac', 0, 0, 0, '0', 0, 0, 0, 0, 'idle', 0, $OPENQRM_EXEC_PORT, 30, 'booting', 'detected')"); } |
|
From: Matt <mat...@us...> - 2008-01-19 19:37:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13430/devel/ng/openqrm/src/etc Modified Files: openqrm-server.conf Log Message: added starting the openqrm-client on the booted resources Index: openqrm-server.conf =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/openqrm-server.conf,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** openqrm-server.conf 19 Jan 2008 18:14:19 -0000 1.16 --- openqrm-server.conf 19 Jan 2008 19:38:01 -0000 1.17 *************** *** 57,60 **** --- 57,65 ---- OPENQRM_EXEC_PORT=1667 + # OPENQRM_RESOURCE_BASE_DIR defines the basedir to use for + # openQRM related stuff on the managed resources + # by default it is set to the same as openQRM-server base-directory (/opt) + OPENQRM_RESOURCE_BASE_DIR=/opt + # these are the main openQRM-server dependencies # which configure the package-dependencies for the *************** *** 71,78 **** # for suse-based systems docroot is at /srv/www/htdocs/ - # OPENQRM_SERVER_DEFAULT_KERNEL defines the kernel for the default boot-image - # please notice that the kernel should have EXT2 support statically compiled in - # (needed to mount the initrd's which are in EXT2 format - if [ -f /etc/debian_version ]; then OPENQRM_SERVER_DEPENDENCIES="apache2, php5, php5-mysql, libphp-adodb, mysql-server, mysql-client-5.0, syslinux" --- 76,79 ---- |
|
From: Matt <mat...@us...> - 2008-01-19 19:37:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13430/devel/ng/openqrm/src/etc/templates Modified Files: openqrm-linuxrc Log Message: added starting the openqrm-client on the booted resources Index: openqrm-linuxrc =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/templates/openqrm-linuxrc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** openqrm-linuxrc 19 Jan 2008 18:14:23 -0000 1.5 --- openqrm-linuxrc 19 Jan 2008 19:38:01 -0000 1.6 *************** *** 76,79 **** --- 76,86 ---- # will do "nothing" anyway + # run default openqrm-client boot-service + cd / + wget "http://$OPENQRM_SERVER_IP_ADDRESS/openqrm/boot-service/openqrm-client.tgz" + tar -xzf openqrm-client.tgz + rm -f openqrm-client.tgz + $resource_basedir/openqrm/etc/init.d/openqrm-client start + /bin/bash |
|
From: Matt <mat...@us...> - 2008-01-19 19:37:59
|
Update of /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/init.d In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13430/devel/ng/openqrm/src/etc/init.d Modified Files: openqrm-client Log Message: added starting the openqrm-client on the booted resources Index: openqrm-client =================================================================== RCS file: /cvsroot/openqrm/base/devel/ng/openqrm/src/etc/init.d/openqrm-client,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** openqrm-client 12 Jan 2008 17:01:21 -0000 1.1 --- openqrm-client 19 Jan 2008 19:38:01 -0000 1.2 *************** *** 22,32 **** export `eval cat /proc/cmdline` ! if [ -f /var/openqrm/conf/openqrm.conf.$id ];then ! . /var/openqrm/conf/openqrm.conf.$id ! fi ! ! . $OPENQRM_RESOURCE_BASE_DIR/openqrm/include/openqrm-functions ! . $OPENQRM_RESOURCE_BASE_DIR/openqrm/include/openqrm-nodes-functions ! function openqrm_client_start() { --- 22,28 ---- export `eval cat /proc/cmdline` ! . /var/openqrm/openqrm-resource.conf ! export OPENQRM_SERVER_BASE_DIR=$resource_basedir ! . $resource_basedir/openqrm/include/openqrm-functions function openqrm_client_start() { *************** *** 36,39 **** --- 32,38 ---- grep -q "/initrd" /proc/mounts && umount /initrd + # start openqrm-execd + $resource_basedir/openqrm/sbin/openqrm-exec-port-monitor $resource_ip $resource_execdport | $resource_basedir/openqrm/sbin/openqrm-execd & + touch ${LOCKFILE} } *************** *** 42,46 **** function openqrm_client_stop() { echo "Stopping openQRM-client" ! /bin/rm -f ${LOCKFILE} } --- 41,47 ---- function openqrm_client_stop() { echo "Stopping openQRM-client" ! # stop openqrm-execd ! killall openqrm-exec-port-monitor 1>/dev/null 2>&1 ! killall openqrm-execd 1>/dev/null 2>&1 /bin/rm -f ${LOCKFILE} } *************** *** 60,65 **** openqrm_client_start ;; - openqrm_client_start - ;; stop) openqrm_client_stop --- 61,64 ---- |