ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [30/50] incubator-ignite git commit: Merge branch 'ignite-gg-9830' into ignite-sprint-4
Date Wed, 29 Apr 2015 13:01:34 GMT
Merge branch 'ignite-gg-9830' into ignite-sprint-4

Conflicts:
	modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d5121aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d5121aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d5121aa

Branch: refs/heads/ignite-630
Commit: 8d5121aafd1471bd716c77e43a96f7896ceda4b7
Parents: 998fb78 d411b9f
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Apr 28 21:26:14 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Apr 28 21:26:14 2015 +0700

----------------------------------------------------------------------
 .../internal/cluster/ClusterGroupAdapter.java   |  16 +
 .../visor/cache/VisorCacheConfiguration.java    |   7 -
 .../visor/cache/VisorCacheNodesTask.java        |  74 +++
 .../cache/VisorCacheStoreConfiguration.java     |  35 --
 .../cache/VisorCacheTypeFieldMetadata.java      |  36 +-
 .../visor/cache/VisorCacheTypeMetadata.java     |  99 +---
 .../internal/visor/igfs/VisorIgfsMetrics.java   | 128 +----
 .../node/VisorNodeEventsCollectorTask.java      |  58 +-
 .../internal/visor/query/VisorQueryArg.java     |  19 +-
 .../internal/visor/query/VisorQueryCursor.java  |   1 -
 .../internal/visor/query/VisorQueryJob.java     |   9 +-
 .../internal/visor/query/VisorQueryTask.java    |  41 --
 .../internal/visor/util/VisorEventMapper.java   |  13 +
 .../internal/visor/util/VisorTaskUtils.java     |   2 +-
 ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +++++
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +
 .../ignite/visor/commands/VisorConsole.scala    | 314 ++++++-----
 .../visor/commands/VisorConsoleCommand.scala    |  77 ---
 .../ignite/visor/commands/VisorTextTable.scala  | 539 ------------------
 .../visor/commands/ack/VisorAckCommand.scala    |  42 +-
 .../commands/alert/VisorAlertCommand.scala      |  35 +-
 .../commands/cache/VisorCacheClearCommand.scala |  51 +-
 .../commands/cache/VisorCacheCommand.scala      |  34 +-
 .../commands/cache/VisorCacheScanCommand.scala  |  60 +-
 .../commands/cache/VisorCacheStopCommand.scala  |  30 +-
 .../commands/cache/VisorCacheSwapCommand.scala  |  66 +--
 .../commands/common/VisorConsoleCommand.scala   |  90 +++
 .../visor/commands/common/VisorTextTable.scala  | 543 +++++++++++++++++++
 .../config/VisorConfigurationCommand.scala      | 439 +++++++--------
 .../commands/deploy/VisorDeployCommand.scala    |  47 +-
 .../commands/disco/VisorDiscoveryCommand.scala  |  58 +-
 .../commands/events/VisorEventsCommand.scala    | 338 +++++-------
 .../visor/commands/gc/VisorGcCommand.scala      | 130 ++---
 .../visor/commands/kill/VisorKillCommand.scala  |  53 +-
 .../visor/commands/node/VisorNodeCommand.scala  |  47 +-
 .../visor/commands/ping/VisorPingCommand.scala  |  41 +-
 .../commands/start/VisorStartCommand.scala      |  34 +-
 .../commands/tasks/VisorTasksCommand.scala      |  76 +--
 .../commands/top/VisorTopologyCommand.scala     |  36 +-
 .../visor/commands/vvm/VisorVvmCommand.scala    |  32 +-
 .../scala/org/apache/ignite/visor/visor.scala   | 278 +++++++---
 .../ignite/visor/VisorTextTableSpec.scala       |   3 +-
 42 files changed, 1973 insertions(+), 2207 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d5121aa/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index cab7f03,6bf72aa..c24cc13
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@@ -1620,9 -1665,10 +1665,10 @@@ object visor extends VisorTag 
          // Make sure visor starts without shutdown hook.
          System.setProperty(IGNITE_NO_SHUTDOWN_HOOK, "true")
  
-         // Set NullLoger in quite mode.
-         if ("true".equalsIgnoreCase(System.getProperty(IGNITE_QUIET, "true")))
-             cfg.setGridLogger(new NullLogger)
+         sys.props.get(IGNITE_QUIET).map(_.toBoolean) match {
 -            case Some(true) =>  // No-op.
 -            case _ => cfg.setGridLogger(new NullLogger)
++            case Some(true) =>  // Node will print to Visor console in verbose mode..
++            case _ => cfg.setGridLogger(new NullLogger) // Set NullLoger in quite mode.
+         }
  
          val startedGridName = try {
               Ignition.start(cfg).name


Mime
View raw message