[Modify] Rename them

This commit is contained in:
sta 2017-04-14 17:24:52 +09:00
parent 9d8ed6987b
commit 94dcb5c5a8

View File

@ -49,7 +49,7 @@ namespace WebSocketSharp.Server
private volatile bool _clean; private volatile bool _clean;
private Dictionary<string, WebSocketServiceHost> _hosts; private Dictionary<string, WebSocketServiceHost> _hosts;
private Logger _logger; private Logger _log;
private volatile ServerState _state; private volatile ServerState _state;
private object _sync; private object _sync;
private TimeSpan _waitTime; private TimeSpan _waitTime;
@ -58,9 +58,9 @@ namespace WebSocketSharp.Server
#region Internal Constructors #region Internal Constructors
internal WebSocketServiceManager (Logger logger) internal WebSocketServiceManager (Logger log)
{ {
_logger = logger; _log = log;
_clean = true; _clean = true;
_hosts = new Dictionary<string, WebSocketServiceHost> (); _hosts = new Dictionary<string, WebSocketServiceHost> ();
@ -275,8 +275,8 @@ namespace WebSocketSharp.Server
completed (); completed ();
} }
catch (Exception ex) { catch (Exception ex) {
_logger.Error (ex.Message); _log.Error (ex.Message);
_logger.Debug (ex.ToString ()); _log.Debug (ex.ToString ());
} }
finally { finally {
cache.Clear (); cache.Clear ();
@ -298,8 +298,8 @@ namespace WebSocketSharp.Server
completed (); completed ();
} }
catch (Exception ex) { catch (Exception ex) {
_logger.Error (ex.Message); _log.Error (ex.Message);
_logger.Debug (ex.ToString ()); _log.Debug (ex.ToString ());
} }
finally { finally {
foreach (var cached in cache.Values) foreach (var cached in cache.Values)
@ -354,7 +354,7 @@ namespace WebSocketSharp.Server
throw new ArgumentException ("Already in use.", "path"); throw new ArgumentException ("Already in use.", "path");
host = new WebSocketServiceHost<TBehavior> ( host = new WebSocketServiceHost<TBehavior> (
path, creator, null, _logger path, creator, null, _log
); );
if (!_clean) if (!_clean)
@ -514,7 +514,7 @@ namespace WebSocketSharp.Server
throw new ArgumentException ("Already in use.", "path"); throw new ArgumentException ("Already in use.", "path");
host = new WebSocketServiceHost<TBehavior> ( host = new WebSocketServiceHost<TBehavior> (
path, () => new TBehavior (), initializer, _logger path, () => new TBehavior (), initializer, _log
); );
if (!_clean) if (!_clean)
@ -770,7 +770,7 @@ namespace WebSocketSharp.Server
} }
if (len < length) { if (len < length) {
_logger.Warn ( _log.Warn (
String.Format ( String.Format (
"Only {0} byte(s) of data could be read from the specified stream.", "Only {0} byte(s) of data could be read from the specified stream.",
len len