Skip to content

Commit dfe5e89

Browse files
committed
Remove more references to seelog
1 parent cfb7ac5 commit dfe5e89

File tree

8 files changed

+3
-59
lines changed

8 files changed

+3
-59
lines changed

THIRD-PARTY

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ or your relevant customer agreement with AWS, and is licensed to you under that
33

44
The Amazon Session Manager Plugin includes the following third-party software/licensing:
55

6-
** cihub/seelog - https://github.com/cihub/seelog
7-
Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>. All rights reserved.
86
** gorilla/websocket - https://github.com/gorilla/websocket
97
Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.
108
** fsnotigy/fsnotify - https://github.com/fsnotify/fsnotify
@@ -109,4 +107,4 @@ Unless required by applicable law or agreed to in writing, software
109107
distributed under the License is distributed on an "AS IS" BASIS,
110108
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
111109
See the License for the specific language governing permissions and
112-
limitations under the License.
110+
limitations under the License.

makefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ pre-build:
5656
$(COPY) $(GO_SPACE)/README.md $(GO_SPACE)/bin/
5757
$(COPY) $(GO_SPACE)/RELEASENOTES.md $(GO_SPACE)/bin/
5858
$(COPY) $(GO_SPACE)/THIRD-PARTY $(GO_SPACE)/bin/
59-
$(COPY) $(GO_SPACE)/seelog_unix.xml $(GO_SPACE)/bin/
60-
$(COPY) $(GO_SPACE)/seelog_windows.xml.template $(GO_SPACE)/bin/
6159

6260
@echo "Regenerate version file during pre-release"
6361
go run $(GO_SPACE)/src/version/versiongenerator/version-gen.go
@@ -147,34 +145,29 @@ prepack-linux-amd64:
147145
mkdir -p $(GO_SPACE)/bin/prepacked/linux_amd64
148146
mkdir -p $(GO_SPACE)/bin/prepacked/linux_amd64_plugin
149147
$(COPY) $(GO_SPACE)/bin/linux_amd64_plugin/session-manager-plugin $(GO_SPACE)/bin/prepacked/linux_amd64_plugin/session-manager-plugin
150-
$(COPY) $(GO_SPACE)/bin/seelog_unix.xml $(GO_SPACE)/bin/prepacked/linux_amd64_plugin/seelog.xml
151148
$(COPY) $(GO_SPACE)/bin/LICENSE $(GO_SPACE)/bin/prepacked/linux_amd64_plugin/LICENSE
152149
$(COPY) $(GO_SPACE)/bin/NOTICE $(GO_SPACE)/bin/prepacked/linux_amd64_plugin/NOTICE
153150
$(COPY) $(GO_SPACE)/bin/README.md $(GO_SPACE)/bin/prepacked/linux_amd64_plugin/README.md
154151
$(COPY) $(GO_SPACE)/bin/RELEASENOTES.md $(GO_SPACE)/bin/prepacked/linux_amd64_plugin/RELEASENOTES.md
155152
$(COPY) $(GO_SPACE)/bin/THIRD-PARTY $(GO_SPACE)/bin/prepacked/linux_amd64_plugin/THIRD-PARTY
156153
$(COPY) $(GO_SPACE)/bin/linux_amd64/ssmcli $(GO_SPACE)/bin/prepacked/linux_amd64/ssmcli
157-
$(COPY) $(GO_SPACE)/bin/seelog_unix.xml $(GO_SPACE)/bin/prepacked/linux_amd64/seelog.xml.template
158154

159155
.PHONY: prepack-linux-386
160156
prepack-linux-386:
161157
mkdir -p $(GO_SPACE)/bin/prepacked/linux_386
162158
mkdir -p $(GO_SPACE)/bin/prepacked/linux_386_plugin
163159
$(COPY) $(GO_SPACE)/bin/linux_386_plugin/session-manager-plugin $(GO_SPACE)/bin/prepacked/linux_386_plugin/session-manager-plugin
164-
$(COPY) $(GO_SPACE)/bin/seelog_unix.xml $(GO_SPACE)/bin/prepacked/linux_386_plugin/seelog.xml
165160
$(COPY) $(GO_SPACE)/bin/LICENSE $(GO_SPACE)/bin/prepacked/linux_386_plugin/LICENSE
166161
$(COPY) $(GO_SPACE)/bin/NOTICE $(GO_SPACE)/bin/prepacked/linux_386_plugin/NOTICE
167162
$(COPY) $(GO_SPACE)/bin/README.md $(GO_SPACE)/bin/prepacked/linux_386_plugin/README.md
168163
$(COPY) $(GO_SPACE)/bin/RELEASENOTES.md $(GO_SPACE)/bin/prepacked/linux_386_plugin/RELEASENOTES.md
169164
$(COPY) $(GO_SPACE)/bin/THIRD-PARTY $(GO_SPACE)/bin/prepacked/linux_386_plugin/THIRD-PARTY
170165
$(COPY) $(GO_SPACE)/bin/linux_386/ssmcli $(GO_SPACE)/bin/prepacked/linux_386/ssmcli
171-
$(COPY) $(GO_SPACE)/bin/seelog_unix.xml $(GO_SPACE)/bin/prepacked/linux_386/seelog.xml.template
172166

173167
.PHONY: prepack-linux-arm64
174168
prepack-linux-arm64:
175169
mkdir -p $(GO_SPACE)/bin/prepacked/linux_arm64_plugin
176170
$(COPY) $(GO_SPACE)/bin/linux_arm64_plugin/session-manager-plugin $(GO_SPACE)/bin/prepacked/linux_arm64_plugin/session-manager-plugin
177-
$(COPY) $(GO_SPACE)/bin/seelog_unix.xml $(GO_SPACE)/bin/prepacked/linux_arm64_plugin/seelog.xml
178171
$(COPY) $(GO_SPACE)/bin/LICENSE $(GO_SPACE)/bin/prepacked/linux_arm64_plugin/LICENSE
179172
$(COPY) $(GO_SPACE)/bin/NOTICE $(GO_SPACE)/bin/prepacked/linux_arm64_plugin/NOTICE
180173
$(COPY) $(GO_SPACE)/bin/README.md $(GO_SPACE)/bin/prepacked/linux_arm64_plugin/README.md
@@ -186,28 +179,24 @@ prepack-windows-386:
186179
mkdir -p $(GO_SPACE)/bin/prepacked/windows_386
187180
mkdir -p $(GO_SPACE)/bin/prepacked/windows_386_plugin
188181
$(COPY) $(GO_SPACE)/bin/windows_386_plugin/session-manager-plugin.exe $(GO_SPACE)/bin/prepacked/windows_386_plugin/session-manager-plugin.exe
189-
$(COPY) $(GO_SPACE)/bin/seelog_windows.xml.template $(GO_SPACE)/bin/prepacked/windows_386_plugin/seelog.xml.template
190182
$(COPY) $(GO_SPACE)/bin/LICENSE $(GO_SPACE)/bin/prepacked/windows_386_plugin/LICENSE
191183
$(COPY) $(GO_SPACE)/bin/NOTICE $(GO_SPACE)/bin/prepacked/windows_386_plugin/NOTICE
192184
$(COPY) $(GO_SPACE)/bin/README.md $(GO_SPACE)/bin/prepacked/windows_386_plugin/README.md
193185
$(COPY) $(GO_SPACE)/bin/RELEASENOTES.md $(GO_SPACE)/bin/prepacked/windows_386_plugin/RELEASENOTES.md
194186
$(COPY) $(GO_SPACE)/bin/THIRD-PARTY $(GO_SPACE)/bin/prepacked/windows_386_plugin/THIRD-PARTY
195187
$(COPY) $(GO_SPACE)/bin/windows_386/ssmcli.exe $(GO_SPACE)/bin/prepacked/windows_386/ssmcli.exe
196-
$(COPY) $(GO_SPACE)/bin/seelog_windows.xml.template $(GO_SPACE)/bin/prepacked/windows_386/seelog.xml.template
197188

198189
.PHONY: prepack-windows-amd64
199190
prepack-windows-amd64:
200191
mkdir -p $(GO_SPACE)/bin/prepacked/windows_amd64
201192
mkdir -p $(GO_SPACE)/bin/prepacked/windows_amd64_plugin
202193
$(COPY) $(GO_SPACE)/bin/windows_amd64_plugin/session-manager-plugin.exe $(GO_SPACE)/bin/prepacked/windows_amd64_plugin/session-manager-plugin.exe
203-
$(COPY) $(GO_SPACE)/bin/seelog_windows.xml.template $(GO_SPACE)/bin/prepacked/windows_amd64_plugin/seelog.xml.template
204194
$(COPY) $(GO_SPACE)/bin/LICENSE $(GO_SPACE)/bin/prepacked/windows_amd64_plugin/LICENSE
205195
$(COPY) $(GO_SPACE)/bin/NOTICE $(GO_SPACE)/bin/prepacked/windows_amd64_plugin/NOTICE
206196
$(COPY) $(GO_SPACE)/bin/README.md $(GO_SPACE)/bin/prepacked/windows_amd64_plugin/README.md
207197
$(COPY) $(GO_SPACE)/bin/RELEASENOTES.md $(GO_SPACE)/bin/prepacked/windows_amd64_plugin/RELEASENOTES.md
208198
$(COPY) $(GO_SPACE)/bin/THIRD-PARTY $(GO_SPACE)/bin/prepacked/windows_amd64_plugin/THIRD-PARTY
209199
$(COPY) $(GO_SPACE)/bin/windows_amd64/ssmcli.exe $(GO_SPACE)/bin/prepacked/windows_amd64/ssmcli.exe
210-
$(COPY) $(GO_SPACE)/bin/seelog_windows.xml.template $(GO_SPACE)/bin/prepacked/windows_amd64/seelog.xml.template
211200

212201
.PHONY: package-rpm-amd64
213202
package-rpm-amd64: create-package-folder
@@ -263,9 +252,6 @@ copy-package-dependencies:
263252
$(COPY) -r $(GO_SPACE)/Tools $(GO_SPACE)/bin/package_dependencies/
264253
$(COPY) -r $(GO_SPACE)/packaging $(GO_SPACE)/bin/package_dependencies/
265254

266-
$(COPY) -r $(GO_SPACE)/seelog_unix.xml $(GO_SPACE)/bin/package_dependencies/
267-
$(COPY) -r $(GO_SPACE)/seelog_windows.xml.template $(GO_SPACE)/bin/package_dependencies/
268-
269255
$(COPY) -r $(GO_SPACE)/RELEASENOTES.md $(GO_SPACE)/bin/package_dependencies/
270256
$(COPY) -r $(GO_SPACE)/LICENSE $(GO_SPACE)/bin/package_dependencies/
271257
$(COPY) -r $(GO_SPACE)/NOTICE $(GO_SPACE)/bin/package_dependencies/

packaging/linux/ssmcli.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ This package provides Amazon SSM CLI for managing shell experience using SSM API
1515

1616
%files
1717
%defattr(-,root,root,-)
18-
/etc/amazon/ssmcli/seelog.xml.template
1918
/usr/bin/ssmcli
2019
/var/lib/amazon/ssmcli/
2120

packaging/linux_plugin/session-manager-plugin.spec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ This package provides Amazon SSM SessionManager for managing shell experience us
1515

1616
%files
1717
%defattr(-,root,root,-)
18-
/usr/local/sessionmanagerplugin/seelog.xml.template
1918
/usr/local/sessionmanagerplugin/bin/session-manager-plugin
2019
/var/lib/amazon/sessionmanagerplugin/
2120
/usr/local/sessionmanagerplugin/LICENSE
@@ -39,4 +38,4 @@ ln -s /usr/local/sessionmanagerplugin/bin/session-manager-plugin /usr/local/bin/
3938
rm /usr/local/bin/session-manager-plugin
4039

4140
%clean
42-
# rpmbuild deletes $buildroot after building, specifying clean section to make sure it is not deleted
41+
# rpmbuild deletes $buildroot after building, specifying clean section to make sure it is not deleted

packaging/ubuntu_plugin/conffiles

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/etc/init/session-manager-plugin.conf
2-
/usr/local/sessionmanagerplugin/seelog.xml
32
/lib/systemd/system/session-manager-plugin.service
43
/usr/local/sessionmanagerplugin/LICENSE
54
/usr/local/sessionmanagerplugin/NOTICE

seelog_unix.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

seelog_windows.xml.template

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/log/defaultconfig.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func LoadLog(defaultLogDir string, logFile string, errorFile string) []byte {
2828
logFilePath = filepath.Join(defaultLogDir, logFile)
2929
errorFilePath = filepath.Join(defaultLogDir, errorFile)
3030

31+
// TODO(zph): remove final seelog.xml reference
3132
logConfig := `
3233
<seelog type="adaptive" mininterval="2000000" maxinterval="100000000" critmsgcount="500" minlevel="off">
3334
<exceptions>

0 commit comments

Comments
 (0)