Permalink
Browse files

tabs/spaces

SVN Revision: 769
  • Loading branch information...
1 parent 9faae4b commit bb94bec49d6493fc7275edf1f16884c61348732f @nniclausse nniclausse committed Nov 16, 2007
Showing with 59 additions and 58 deletions.
  1. +3 −3 include/rrdtool.hrl
  2. +8 −7 include/ts_config.hrl
  3. +14 −14 include/ts_jabber.hrl
  4. +7 −7 include/ts_pgsql.hrl
  5. +25 −25 include/ts_profile.hrl
  6. +1 −1 include/ts_raw.hrl
  7. +1 −1 include/ts_recorder.hrl
View
@@ -1,7 +1,7 @@
%%%
%%% Copyright © IDEALX S.A.S. 2004
%%%
-%%% Author : Nicolas Niclausse <nicolas.niclausse@niclux.org>
+%%% Author : Nicolas Niclausse <nicolas.niclausse@niclux.org>
%%% Created: 06 May 2004 by Nicolas Niclausse <nicolas.niclausse@niclux.org>
%%%
%%% This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-%%%
+%%%
-vc('$Id$ ').
-author('nicolas.niclausse@niclux.org').
@@ -37,7 +37,7 @@
% [DS:ds-name:DST:heartbeat:min:max]
-record(rrd_ds, {name,
type = "GAUGE", % GAUGE|COUNTER|DERIVE|ABSOLUTE
- heartbeat = 600, % 10mn
+ heartbeat = 600, % 10mn
min = "U",
max = "U" }).
View
@@ -1,7 +1,7 @@
%%%
%%% Copyright © IDEALX S.A.S. 2003
%%%
-%%% Author : Nicolas Niclausse <nicolas.niclausse@niclux.org>
+%%% Author : Nicolas Niclausse <nicolas.niclausse@niclux.org>
%%% Created: 03 Dec 2003 by Nicolas Niclausse <nicolas.niclausse@niclux.org>
%%%
%%% This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-%%%
+%%%
%%% In addition, as a special exception, you have the permission to
%%% link the code of this program with any library released under
%%% the EPL license and distribute linked combinations including
@@ -33,7 +33,7 @@
-define(DEF_REGEXP_DYNVAR_BEGIN, "name=(\"|')").%'
-define(DEF_REGEXP_DYNVAR_END, "(\"|') ([^>]* )?value=(\"|')\\([^\"]*\\)(\"|')").%'
--record(config, {
+-record(config, {
name,
loglevel = ?WARN,
dump = none,
@@ -58,16 +58,17 @@
file_server= [], % filenames for file_server
load_loop, % loop phases if > 0
ssl_ciphers = negociate
- }).
+ }).
--record(client,
+-record(client,
{host,
weight = 1,
maxusers,
ip = []
}).
--record(server,
+
+-record(server,
{host,
port,
type
@@ -79,7 +80,7 @@
persistent = false,
bidi = false,
ssl_ciphers = negociate,
- size
+ size
}).
-record(arrivalphase,
View
@@ -15,7 +15,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-%%%
+%%%
%%% In addition, as a special exception, you have the permission to
%%% link the code of this program with any library released under
%%% the EPL license and distribute linked combinations including
@@ -27,19 +27,19 @@
-record(jabber_dyndata, {id}).
-record(jabber, {dest,
- size,
+ size,
data,
- type,
- jud_param,
- cle,
- id = 0,
- domain, %% jabber domain
- username, %% first chars of username (will append id dynamically)
- passwd, %% first chars of passwd (will append id dynamically)
- nonce, %% used to generate sip-digest passwd
- sid, %% used to generate digest passwd
- show, %% presence <show/> - see RFC 3921, section 2.2
- status %% presence <status/> - see RFC 3921, section 2.2
- }).
+ type,
+ jud_param,
+ cle,
+ id = 0,
+ domain, %% jabber domain
+ username, %% first chars of username (will append id dynamically)
+ passwd, %% first chars of passwd (will append id dynamically)
+ nonce, %% used to generate sip-digest passwd
+ sid, %% used to generate digest passwd
+ show, %% presence <show/> - see RFC 3921, section 2.2
+ status %% presence <status/> - see RFC 3921, section 2.2
+ }).
-define(setroster_intensity, 1/(ts_utils:get_val(setroster)*1000)).
View
@@ -17,7 +17,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-%%%
+%%%
%%% In addition, as a special exception, you have the permission to
%%% link the code of this program with any library released under
%%% the EPL license and distribute linked combinations including
@@ -38,23 +38,23 @@
sql
}).
-%%
--record(pgsql_dyndata,
- {
+%%
+-record(pgsql_dyndata,
+ {
auth_method,
username, % FIXME: add this at config time in #pgsql_request ?
salt
}
).
%% unused
--record(pgsql,
- {
+-record(pgsql,
+ {
fixme
}
).
-%%% Version 3.0 of the protocol.
+%%% Version 3.0 of the protocol.
%%% Supported in postgres from version 7.4
-define(PROTOCOL_MAJOR, 3).
-define(PROTOCOL_MINOR, 0).
View
@@ -15,7 +15,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-%%%
+%%%
%%% In addition, as a special exception, you have the permission to
%%% link the code of this program with any library released under
%%% the EPL license and distribute linked combinations including
@@ -42,13 +42,13 @@
{thinktime,
ack,
subst=false,
- match=undefined,
+ match=undefined,
dynvar_specs=undefined, % undefined | [{VarName, Regexp} |...]
param,
endpage=false,
host, % override global server hostname
port, % override global server port
- scheme % override global server type (ssl or gen_tcp)
+ scheme % override global server type (ssl or gen_tcp)
}).
% protocol options
@@ -63,38 +63,38 @@
% state of ts_client gen_server
--record(state_rcv,
- {socket=none, %
+-record(state_rcv,
+ {socket=none, %
ip, % local ip to bind to
- timeout, % ?
- host, % hostname (or IP) of remote server
+ timeout, % ?
+ host, % hostname (or IP) of remote server
port, % server port
- protocol, % gen_udp, gen_tcp or ssl
- proto_opts = #proto_opts{}, %
+ protocol, % gen_udp, gen_tcp or ssl
+ proto_opts = #proto_opts{}, %
bidi = false,% true if bidirectional protocol
-
+
profile, % session id
request, % current request specs
persistent, % if true, don't exit when connexion is closed
timestamp, % previous message date
starttime, % date of the beginning of the session
count, % number of requests waiting to be sent
maxcount, % number of requests waiting to be sent
- ack_done=false, % 'true' if the ack was sent, else 'false' (unused if ack=no_ack)
- send_timestamp, % date when the 'request' was sent
- page_timestamp=0, % date when the first 'request' of a page was sent
- acc=[], % Accumulator to store temporary unparsable data
+ ack_done=false, % 'true' if the ack was sent, else 'false' (unused if ack=no_ack)
+ send_timestamp, % date when the 'request' was sent
+ page_timestamp=0, % date when the first 'request' of a page was sent
+ acc=[], % Accumulator to store temporary unparsable data
% (Waiting for more data)
- buffer = <<>>, % buffer when we have to keep the response (we need
+ buffer = <<>>, % buffer when we have to keep the response (we need
% all the response to do pattern matching)
- session, % record of session status; depends on 'clienttype'
+ session, % record of session status; depends on 'clienttype'
datasize=0,
dyndata=[], % persistent data dynamically added during the
% session (Cookies for examples)
clienttype, % module name (ts_jabber, etc.)
transactions=[], % current transactions
dump % type of dump (full, light, none)
- }).
+ }).
-define(restart_sleep, 2000).
-define(infinity_timeout, 15000).
@@ -121,9 +121,9 @@
%% errors messages
-define(LOGF(Msg, Args, Level),
- ts_utils:debug(?MODULE, Msg, Args, Level)).
+ ts_utils:debug(?MODULE, Msg, Args, Level)).
-define(LOG(Msg, Level),
- ts_utils:debug(?MODULE, Msg, Level)).
+ ts_utils:debug(?MODULE, Msg, Level)).
%% Debug messages can be completely disabled if DEBUG is not defined
-ifdef(DEBUG).
@@ -138,11 +138,11 @@
-define(Debug(Msg), ok).
-endif.
--define(EMERG, 0). % The system is unusable.
+-define(EMERG, 0). % The system is unusable.
-define(ALERT, 1). % Action should be taken immediately to address the problem.
--define(CRIT, 2). % A critical condition has occurred.
--define(ERR, 3). % An error has occurred.
--define(WARN, 4). % A significant event that may require attention has occurred.
--define(NOTICE, 5).% An event that does not affect system operation has occurred.
--define(INFO, 6). % An normal operation has occurred.
+-define(CRIT, 2). % A critical condition has occurred.
+-define(ERR, 3). % An error has occurred.
+-define(WARN, 4). % A significant event that may require attention has occurred.
+-define(NOTICE, 5).% An event that does not affect system operation has occurred.
+-define(INFO, 6). % An normal operation has occurred.
-define(DEB, 7). % Debugging info
View
@@ -15,7 +15,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-%%%
+%%%
%%% In addition, as a special exception, you have the permission to
%%% link the code of this program with any library released under
%%% the EPL license and distribute linked combinations including
View
@@ -7,7 +7,7 @@
logfd, % logfile IODevice
prev_port, % previous port
prev_scheme, % previous scheme
- prev_host, % previous hostname
+ prev_host, % previous hostname
timestamp=0, % last request date
plugin,
thinktime_low = 1000 % dot not record thinktime less than this

0 comments on commit bb94bec

Please sign in to comment.