927664 - Gofaster has a number of untracked files in the repo in production

Status: RESOLVED FIXED

(Testing Graveyard :: GoFaster, defect)

Description

[Ed Morley [:emorley]]

Some of these will just be a case of needing to expand .gitignore, some (eg deploy.sh) should be checked into the github repo.

[[e-mail]3 gofaster_dashboard]$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       bin/unit2-2.6
#       deploy.sh
#       lib64
#       src/dashboard/server/nohup.out
nothing added to commit but untracked files present (use "git add" to track)

Comment 1

[Ed Morley [:emorley]]

(In reply to Ed Morley [:edmorley UTC+0] from comment #0)
> [[e-mail]3 gofaster_dashboard]$ git status
> # On branch master
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       bin/unit2-2.6
> #       deploy.sh
> #       lib64
> #       src/dashboard/server/nohup.out
> nothing added to commit but untracked files present (use "git add" to track)

Will, I'm presuming that only deploy.sh should be checked in, the rest added to .gitignore?

Comment 2

[William Lachance (:wlach)]

I actually don't know what deploy.sh does. :) Maybe someone else added it? The other are clearly autogenerated files.

Comment 3

[Ed Morley [:emorley]]

[[e-mail]3 gofaster_dashboard]$ cat src/dashboard/server/nohup.out
http://0.0.0.0:8080/
Traceback (most recent call last):
  File "server.py", line 15, in <module>
    app.run()
  File "/home/webtools/apps/gofaster_dashboard/lib/python2.6/site-packages/web.py-0.36-py2.6.egg/web/application.py", line 311, in run
    return wsgi.runwsgi(self.wsgifunc(*middleware))
  File "/home/webtools/apps/gofaster_dashboard/lib/python2.6/site-packages/web.py-0.36-py2.6.egg/web/wsgi.py", line 54, in runwsgi
    return httpserver.runsimple(func, validip(listget(sys.argv, 1, '')))
  File "/home/webtools/apps/gofaster_dashboard/lib/python2.6/site-packages/web.py-0.36-py2.6.egg/web/httpserver.py", line 148, in runsimple
    server.start()
  File "/home/webtools/apps/gofaster_dashboard/lib/python2.6/site-packages/web.py-0.36-py2.6.egg/web/wsgiserver/__init__.py", line 1753, in start
    raise socket.error(msg)
socket.error: No socket could be created

[[e-mail]3 server]$ ls -al
total 76
drwxr-x--- 5 webtools webtools  4096 Feb  5  2013 .
drwxr-x--x 5 webtools webtools  4096 Apr 18  2012 ..
drwxr-x--- 2 webtools webtools  4096 Aug 15  2013 data
-rw-r----- 1 webtools webtools 15155 Apr 18  2012 handlers.py
-rw-r----- 1 webtools webtools 17878 Apr 18  2012 handlers.pyc
drwxr-x--- 2 webtools webtools  4096 Apr 18  2012 itbf
-rw------- 1 webtools webtools   876 Apr 18  2012 nohup.out

As such, I just deleted nohup.out, since it's long since useful.

This leaves:
[[e-mail]3 gofaster_dashboard]$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       bin/unit2-2.6
#       deploy.sh
#       lib64

[[e-mail]3 gofaster_dashboard]$ cat deploy.sh
#!/bin/sh
cp -r /home/webtools/apps/gofaster_dashboard/src/dashboard/html/* /usr/share/nginx/html/gofaster/

I'll check deploy.sh into the tree and add .gitignore entries for |bin/unit2-2.6| and |lib64|.

Comment 4

[Ed Morley [:emorley]]

Attachment: Update .gitignore

Comment 5

[Ed Morley [:emorley]]

Attachment: Check in the existing deploy.sh

Comment 6

[William Lachance (:wlach)]

Comment on attachment 8434050 [details] [diff] [review]
Update .gitignore

Review of attachment 8434050 [details] [diff] [review]:
-----------------------------------------------------------------

lgtm

Comment 7

[William Lachance (:wlach)]

Comment on attachment 8434051 [details] [diff] [review]
Check in the existing deploy.sh

Review of attachment 8434051 [details] [diff] [review]:
-----------------------------------------------------------------

Sounds like a win.

Comment 8

[Ed Morley [:emorley]]

Thanks :-)

I had to land a followup, since lib64 is in fact a symlink, and it turns out the trailing slash will break cause .gitignore to not match against it otherwise.

https://github.com/mozilla/gofaster/commit/e49c2b68742d2b8e4b829d788fcbb12dd486579e
https://github.com/mozilla/gofaster/commit/f27afc0ecde9bab035b49b75f923b21ad30b570e
https://github.com/mozilla/gofaster/commit/8cf42fe4e40b212c10005cdba48387d4d0aa1813

[[e-mail]3 gofaster_dashboard]$ mv deploy.sh deploy.sh.old

[[e-mail]3 gofaster_dashboard]$ git pull
Updating d203f61..f27afc0
Fast-forward
 .gitignore |    4 +++-
 deploy.sh  |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)
 create mode 100644 deploy.sh
[[e-mail]3 gofaster_dashboard]$ diff -u -B deploy.sh.old deploy.sh

[[e-mail]3 gofaster_dashboard]$ rm deploy.sh.old

[[e-mail]3 gofaster_dashboard]$ git status
# On branch master
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       lib64

[[e-mail]3 gofaster_dashboard]$ ls -al
...
lrwxrwxrwx 1 webtools     2325   42 Apr 18  2012 lib64 -> /home/webtools/apps/gofaster_dashboard/lib

(after followup)
[[e-mail]3 gofaster_dashboard]$ git pull
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From git://github.com/mozilla/gofaster
   f27afc0..8cf42fe  master     -> origin/master
Updating f27afc0..8cf42fe
Fast-forward
 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[[e-mail]3 gofaster_dashboard]$ git status
# On branch master
nothing to commit (working directory clean)