Repository: ambari Updated Branches: refs/heads/branch-2.2 650021ae7 -> 4aa6524af
AMBARI-14084. Ambari Views : each view should have separate log file for better troubleshooting (Nitiraj Rathore via pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4aa6524a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4aa6524a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4aa6524a Branch: refs/heads/branch-2.2 Commit: 4aa6524aff56ac100a8d454b74fb14079bf85d2c Parents: 650021a Author: Pallav Kulshreshtha <pallav....@gmail.com> Authored: Tue Apr 5 16:09:46 2016 +0530 Committer: Pallav Kulshreshtha <pallav....@gmail.com> Committed: Tue Apr 5 16:09:46 2016 +0530 ---------------------------------------------------------------------- .../apache/ambari/server/view/ViewRegistry.java | 2 +- .../src/main/resources/view.log4j.properties | 34 +++++++++--------- .../src/main/resources/view.log4j.properties | 36 +++++++++----------- .../src/main/resources/view.log4j.properties | 33 +++++++++--------- .../src/main/resources/view.log4j.properties | 34 +++++++++--------- .../src/main/resources/view.log4j.properties | 34 +++++++++--------- .../src/main/resources/view.log4j.properties | 34 +++++++++--------- .../src/main/resources/view.log4j.properties | 34 +++++++++--------- .../src/main/resources/view.log4j.properties | 34 +++++++++--------- 9 files changed, 130 insertions(+), 145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java index 6a01351..a75126e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java @@ -1581,7 +1581,7 @@ public class ViewRegistry { private void configureViewLogging(ViewEntity viewDefinition,ClassLoader cl) { URL resourceURL = cl.getResource(VIEW_LOG_FILE); if( null != resourceURL ){ - LOG.debug("setting up logging for view {} as per property file {}",viewDefinition.getName(), resourceURL); + LOG.info("setting up logging for view {} as per property file {}",viewDefinition.getName(), resourceURL); PropertyConfigurator.configure(resourceURL); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties b/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties index 144926a..10b73a5 100644 --- a/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties +++ b/contrib/views/capacity-scheduler/src/main/resources/view.log4j.properties @@ -1,26 +1,24 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. log4j.appender.capshedView=org.apache.log4j.RollingFileAppender -log4j.appender.capshedView.File=/var/log/ambari-server/capshed-view.log +log4j.appender.capshedView.File=/var/log/ambari-server/capshed-view/capshed-view.log log4j.appender.capshedView.MaxFileSize=80MB log4j.appender.capshedView.MaxBackupIndex=60 log4j.appender.capshedView.layout=org.apache.log4j.PatternLayout log4j.appender.capshedView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.view.capacityscheduler=DEBUG,capshedView +log4j.logger.org.apache.ambari.view.capacityscheduler=INFO,capshedView log4j.additivity.org.apache.ambari.view.capacityscheduler = false http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/files/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/files/src/main/resources/view.log4j.properties b/contrib/views/files/src/main/resources/view.log4j.properties index b47fd80..80f135e 100644 --- a/contrib/views/files/src/main/resources/view.log4j.properties +++ b/contrib/views/files/src/main/resources/view.log4j.properties @@ -1,26 +1,24 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. log4j.appender.filesView=org.apache.log4j.RollingFileAppender -log4j.appender.filesView.File=/var/log/ambari-server/files-view.log +log4j.appender.filesView.File=/var/log/ambari-server/files-view/files-view.log log4j.appender.filesView.MaxFileSize=80MB log4j.appender.filesView.MaxBackupIndex=60 log4j.appender.filesView.layout=org.apache.log4j.PatternLayout log4j.appender.filesView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.view.filebrowser=DEBUG,filesView -log4j.additivity.org.apache.ambari.view.filebrowser= true +log4j.logger.org.apache.ambari.view.filebrowser=INFO,filesView +log4j.additivity.org.apache.ambari.view.filebrowser= false http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/hive/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/hive/src/main/resources/view.log4j.properties b/contrib/views/hive/src/main/resources/view.log4j.properties index 3e9454b..227d74b 100644 --- a/contrib/views/hive/src/main/resources/view.log4j.properties +++ b/contrib/views/hive/src/main/resources/view.log4j.properties @@ -1,26 +1,25 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> log4j.appender.hiveView=org.apache.log4j.RollingFileAppender -log4j.appender.hiveView.File=/var/log/ambari-server/hive-view.log +log4j.appender.hiveView.File=/var/log/ambari-server/hive-view/hive-view.log log4j.appender.hiveView.MaxFileSize=80MB log4j.appender.hiveView.MaxBackupIndex=60 log4j.appender.hiveView.layout=org.apache.log4j.PatternLayout log4j.appender.hiveView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.view.hive=DEBUG,hiveView +log4j.logger.org.apache.ambari.view.hive=INFO,hiveView log4j.additivity.org.apache.ambari.view.hive = false http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/jobs/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/jobs/src/main/resources/view.log4j.properties b/contrib/views/jobs/src/main/resources/view.log4j.properties index da54ebf..03d193e 100644 --- a/contrib/views/jobs/src/main/resources/view.log4j.properties +++ b/contrib/views/jobs/src/main/resources/view.log4j.properties @@ -1,27 +1,25 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. log4j.appender.jobsView=org.apache.log4j.RollingFileAppender -log4j.appender.jobsView.File=/var/log/ambari-server/jobs-view.log +log4j.appender.jobsView.File=/var/log/ambari-server/jobs-view/jobs-view.log log4j.appender.jobsView.MaxFileSize=80MB log4j.appender.jobsView.MaxBackupIndex=60 log4j.appender.jobsView.layout=org.apache.log4j.PatternLayout log4j.appender.jobsView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.view.jobs=DEBUG,jobsView +log4j.logger.org.apache.ambari.view.jobs=INFO,jobsView log4j.additivity.org.apache.ambari.view.jobs=false \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/pig/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/view.log4j.properties b/contrib/views/pig/src/main/resources/view.log4j.properties index fcd57eb..756fd3c 100644 --- a/contrib/views/pig/src/main/resources/view.log4j.properties +++ b/contrib/views/pig/src/main/resources/view.log4j.properties @@ -1,26 +1,24 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. log4j.appender.pigView=org.apache.log4j.RollingFileAppender -log4j.appender.pigView.File=/var/log/ambari-server/pig-view.log +log4j.appender.pigView.File=/var/log/ambari-server/pig-view/pig-view.log log4j.appender.pigView.MaxFileSize=80MB log4j.appender.pigView.MaxBackupIndex=60 log4j.appender.pigView.layout=org.apache.log4j.PatternLayout log4j.appender.pigView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.view.pig=DEBUG,pigView +log4j.logger.org.apache.ambari.view.pig=INFO,pigView log4j.additivity.org.apache.ambari.view.pig=false \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/slider/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/view.log4j.properties b/contrib/views/slider/src/main/resources/view.log4j.properties index 68541af..aaed084 100644 --- a/contrib/views/slider/src/main/resources/view.log4j.properties +++ b/contrib/views/slider/src/main/resources/view.log4j.properties @@ -1,26 +1,24 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. log4j.appender.sliderView=org.apache.log4j.RollingFileAppender -log4j.appender.sliderView.File=/var/log/ambari-server/slider-view.log +log4j.appender.sliderView.File=/var/log/ambari-server/slider-view/slider-view.log log4j.appender.sliderView.MaxFileSize=80MB log4j.appender.sliderView.MaxBackupIndex=60 log4j.appender.sliderView.layout=org.apache.log4j.PatternLayout log4j.appender.sliderView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.view.slider=DEBUG,sliderView +log4j.logger.org.apache.ambari.view.slider=INFO,sliderView log4j.additivity.org.apache.ambari.view.slider=false \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/storm/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/storm/src/main/resources/view.log4j.properties b/contrib/views/storm/src/main/resources/view.log4j.properties index 3383137..8d4f483 100644 --- a/contrib/views/storm/src/main/resources/view.log4j.properties +++ b/contrib/views/storm/src/main/resources/view.log4j.properties @@ -1,26 +1,24 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. log4j.appender.stormView=org.apache.log4j.RollingFileAppender -log4j.appender.stormView.File=/var/log/ambari-server/storm-view.log +log4j.appender.stormView.File=/var/log/ambari-server/storm-view/storm-view.log log4j.appender.stormView.MaxFileSize=80MB log4j.appender.stormView.MaxBackupIndex=60 log4j.appender.stormView.layout=org.apache.log4j.PatternLayout log4j.appender.stormView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.storm=DEBUG,stormView +log4j.logger.org.apache.ambari.storm=INFO,stormView log4j.additivity.org.apache.ambari.storm=false \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/4aa6524a/contrib/views/tez/src/main/resources/view.log4j.properties ---------------------------------------------------------------------- diff --git a/contrib/views/tez/src/main/resources/view.log4j.properties b/contrib/views/tez/src/main/resources/view.log4j.properties index ae1f5ce..8608da0 100644 --- a/contrib/views/tez/src/main/resources/view.log4j.properties +++ b/contrib/views/tez/src/main/resources/view.log4j.properties @@ -1,26 +1,24 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. log4j.appender.tezView=org.apache.log4j.RollingFileAppender -log4j.appender.tezView.File=/var/log/ambari-server/tez-view.log +log4j.appender.tezView.File=/var/log/ambari-server/tez-view/tez-view.log log4j.appender.tezView.MaxFileSize=80MB log4j.appender.tezView.MaxBackupIndex=60 log4j.appender.tezView.layout=org.apache.log4j.PatternLayout log4j.appender.tezView.layout.ConversionPattern=%d{DATE} %5p [%t] %c{1}:%L - %m%n -log4j.logger.org.apache.ambari.view.tez=DEBUG,tezView +log4j.logger.org.apache.ambari.view.tez=INFO,tezView log4j.additivity.org.apache.ambari.view.tez=false \ No newline at end of file
